SONAR-6942 Reorganize ITs

281 files changed, 2105 insertions, 1881 deletions

diff --git a/it/it-projects/batch/case-sensitive-file-extensions/sonar-project.properties b/it/it-projects/analysis/case-sensitive-file-extensions/sonar-project.properties
index 795bbeb5cf9..795bbeb5cf9 100644
--- a/it/it-projects/batch/case-sensitive-file-extensions/sonar-project.properties
+++ b/it/it-projects/analysis/case-sensitive-file-extensions/sonar-project.properties
diff --git a/it/it-projects/batch/case-sensitive-file-extensions/src/UPPER.XOO b/it/it-projects/analysis/case-sensitive-file-extensions/src/UPPER.XOO
index 7a7569a867b..7a7569a867b 100644
--- a/it/it-projects/batch/case-sensitive-file-extensions/src/UPPER.XOO
+++ b/it/it-projects/analysis/case-sensitive-file-extensions/src/UPPER.XOO
diff --git a/it/it-projects/batch/case-sensitive-file-extensions/src/UPPER.XOO.measures b/it/it-projects/analysis/case-sensitive-file-extensions/src/UPPER.XOO.measures
index 5143bc664f8..5143bc664f8 100644
--- a/it/it-projects/batch/case-sensitive-file-extensions/src/UPPER.XOO.measures
+++ b/it/it-projects/analysis/case-sensitive-file-extensions/src/UPPER.XOO.measures
diff --git a/it/it-projects/batch/case-sensitive-file-extensions/src/lower.xoo b/it/it-projects/analysis/case-sensitive-file-extensions/src/lower.xoo
index fd97999fff8..fd97999fff8 100644
--- a/it/it-projects/batch/case-sensitive-file-extensions/src/lower.xoo
+++ b/it/it-projects/analysis/case-sensitive-file-extensions/src/lower.xoo
diff --git a/it/it-projects/batch/case-sensitive-file-extensions/src/lower.xoo.measures b/it/it-projects/analysis/case-sensitive-file-extensions/src/lower.xoo.measures
index f82c5911efa..f82c5911efa 100644
--- a/it/it-projects/batch/case-sensitive-file-extensions/src/lower.xoo.measures
+++ b/it/it-projects/analysis/case-sensitive-file-extensions/src/lower.xoo.measures
diff --git a/it/it-projects/batch/custom-module-key/module_a/sonar-project.properties b/it/it-projects/analysis/custom-module-key/module_a/sonar-project.properties
index 7c95bd81729..7c95bd81729 100644
--- a/it/it-projects/batch/custom-module-key/module_a/sonar-project.properties
+++ b/it/it-projects/analysis/custom-module-key/module_a/sonar-project.properties
diff --git a/it/it-projects/batch/custom-module-key/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo b/it/it-projects/analysis/custom-module-key/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
index 74d29a4fa08..74d29a4fa08 100644
--- a/it/it-projects/batch/custom-module-key/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
+++ b/it/it-projects/analysis/custom-module-key/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
diff --git a/it/it-projects/batch/custom-module-key/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures b/it/it-projects/analysis/custom-module-key/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
index 7812e4167fb..7812e4167fb 100644
--- a/it/it-projects/batch/custom-module-key/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
+++ b/it/it-projects/analysis/custom-module-key/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
diff --git a/it/it-projects/batch/custom-module-key/module_b/sonar-project.properties b/it/it-projects/analysis/custom-module-key/module_b/sonar-project.properties
index 04cd79e2247..04cd79e2247 100644
--- a/it/it-projects/batch/custom-module-key/module_b/sonar-project.properties
+++ b/it/it-projects/analysis/custom-module-key/module_b/sonar-project.properties
diff --git a/it/it-projects/batch/custom-module-key/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo b/it/it-projects/analysis/custom-module-key/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
index 42039538a92..42039538a92 100644
--- a/it/it-projects/batch/custom-module-key/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
+++ b/it/it-projects/analysis/custom-module-key/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
diff --git a/it/it-projects/batch/custom-module-key/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures b/it/it-projects/analysis/custom-module-key/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
index 3947d3bdbff..3947d3bdbff 100644
--- a/it/it-projects/batch/custom-module-key/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
+++ b/it/it-projects/analysis/custom-module-key/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
diff --git a/it/it-projects/batch/custom-module-key/sonar-project.properties b/it/it-projects/analysis/custom-module-key/sonar-project.properties
index 7935cb5ffb0..7935cb5ffb0 100644
--- a/it/it-projects/batch/custom-module-key/sonar-project.properties
+++ b/it/it-projects/analysis/custom-module-key/sonar-project.properties
diff --git a/it/it-projects/batch/duplicate-source/sonar-project.properties b/it/it-projects/analysis/duplicate-source/sonar-project.properties
index cf176850bae..cf176850bae 100644
--- a/it/it-projects/batch/duplicate-source/sonar-project.properties
+++ b/it/it-projects/analysis/duplicate-source/sonar-project.properties
diff --git a/it/it-projects/batch/duplicate-source/src/main/xoo/org/sonar/tests/ClassOne.xoo b/it/it-projects/analysis/duplicate-source/src/main/xoo/org/sonar/tests/ClassOne.xoo
index 8cf8aec82fe..8cf8aec82fe 100644
--- a/it/it-projects/batch/duplicate-source/src/main/xoo/org/sonar/tests/ClassOne.xoo
+++ b/it/it-projects/analysis/duplicate-source/src/main/xoo/org/sonar/tests/ClassOne.xoo
diff --git a/it/it-projects/batch/duplicate-source/src/main/xoo2/org/sonar/tests/ClassOne.xoo b/it/it-projects/analysis/duplicate-source/src/main/xoo2/org/sonar/tests/ClassOne.xoo
index 8cf8aec82fe..8cf8aec82fe 100644
--- a/it/it-projects/batch/duplicate-source/src/main/xoo2/org/sonar/tests/ClassOne.xoo
+++ b/it/it-projects/analysis/duplicate-source/src/main/xoo2/org/sonar/tests/ClassOne.xoo
diff --git a/it/it-projects/batch/duplicate-source/src/test/xoo/org/sonar/tests/ClassOne.xoo b/it/it-projects/analysis/duplicate-source/src/test/xoo/org/sonar/tests/ClassOne.xoo
index 8cf8aec82fe..8cf8aec82fe 100644
--- a/it/it-projects/batch/duplicate-source/src/test/xoo/org/sonar/tests/ClassOne.xoo
+++ b/it/it-projects/analysis/duplicate-source/src/test/xoo/org/sonar/tests/ClassOne.xoo
diff --git a/it/it-projects/batch/extension-lifecycle/module_a/pom.xml b/it/it-projects/analysis/extension-lifecycle/module_a/pom.xml
index 8cc056c4e81..8cc056c4e81 100644
--- a/it/it-projects/batch/extension-lifecycle/module_a/pom.xml
+++ b/it/it-projects/analysis/extension-lifecycle/module_a/pom.xml
diff --git a/it/it-projects/batch/extension-lifecycle/module_a/src/main/java/HelloA.java b/it/it-projects/analysis/extension-lifecycle/module_a/src/main/java/HelloA.java
index 847098b9a50..847098b9a50 100644
--- a/it/it-projects/batch/extension-lifecycle/module_a/src/main/java/HelloA.java
+++ b/it/it-projects/analysis/extension-lifecycle/module_a/src/main/java/HelloA.java
diff --git a/it/it-projects/batch/extension-lifecycle/module_b/pom.xml b/it/it-projects/analysis/extension-lifecycle/module_b/pom.xml
index 449325b7691..449325b7691 100644
--- a/it/it-projects/batch/extension-lifecycle/module_b/pom.xml
+++ b/it/it-projects/analysis/extension-lifecycle/module_b/pom.xml
diff --git a/it/it-projects/batch/extension-lifecycle/module_b/src/main/java/HelloB.java b/it/it-projects/analysis/extension-lifecycle/module_b/src/main/java/HelloB.java
index afc7d2c906c..afc7d2c906c 100644
--- a/it/it-projects/batch/extension-lifecycle/module_b/src/main/java/HelloB.java
+++ b/it/it-projects/analysis/extension-lifecycle/module_b/src/main/java/HelloB.java
diff --git a/it/it-projects/batch/extension-lifecycle/pom.xml b/it/it-projects/analysis/extension-lifecycle/pom.xml
index 30de64cef8c..30de64cef8c 100644
--- a/it/it-projects/batch/extension-lifecycle/pom.xml
+++ b/it/it-projects/analysis/extension-lifecycle/pom.xml
diff --git a/it/it-projects/batch/links-project/pom.xml b/it/it-projects/analysis/links-project/pom.xml
index a0bc27aaab6..a0bc27aaab6 100644
--- a/it/it-projects/batch/links-project/pom.xml
+++ b/it/it-projects/analysis/links-project/pom.xml
diff --git a/it/it-projects/batch/links-project/sonar-project.properties b/it/it-projects/analysis/links-project/sonar-project.properties
index 4352408bd5c..4352408bd5c 100644
--- a/it/it-projects/batch/links-project/sonar-project.properties
+++ b/it/it-projects/analysis/links-project/sonar-project.properties
diff --git a/it/it-projects/batch/links-project/src/main/java/sample/Sample.java b/it/it-projects/analysis/links-project/src/main/java/sample/Sample.java
index b1210973dd9..b1210973dd9 100644
--- a/it/it-projects/batch/links-project/src/main/java/sample/Sample.java
+++ b/it/it-projects/analysis/links-project/src/main/java/sample/Sample.java
diff --git a/it/it-projects/batch/multi-languages/java-module/pom.xml b/it/it-projects/analysis/multi-languages/java-module/pom.xml
index 9b9cb11763f..9b9cb11763f 100644
--- a/it/it-projects/batch/multi-languages/java-module/pom.xml
+++ b/it/it-projects/analysis/multi-languages/java-module/pom.xml
diff --git a/it/it-projects/batch/multi-languages/java-module/src/main/java/HelloJava.java b/it/it-projects/analysis/multi-languages/java-module/src/main/java/HelloJava.java
index c575aeb9d4c..c575aeb9d4c 100644
--- a/it/it-projects/batch/multi-languages/java-module/src/main/java/HelloJava.java
+++ b/it/it-projects/analysis/multi-languages/java-module/src/main/java/HelloJava.java
diff --git a/it/it-projects/batch/multi-languages/javascript-module/pom.xml b/it/it-projects/analysis/multi-languages/javascript-module/pom.xml
index f0eb641e9e2..f0eb641e9e2 100644
--- a/it/it-projects/batch/multi-languages/javascript-module/pom.xml
+++ b/it/it-projects/analysis/multi-languages/javascript-module/pom.xml
diff --git a/it/it-projects/batch/multi-languages/javascript-module/src/Person.js b/it/it-projects/analysis/multi-languages/javascript-module/src/Person.js
index d5eb180de72..d5eb180de72 100644
--- a/it/it-projects/batch/multi-languages/javascript-module/src/Person.js
+++ b/it/it-projects/analysis/multi-languages/javascript-module/src/Person.js
diff --git a/it/it-projects/batch/multi-languages/pom.xml b/it/it-projects/analysis/multi-languages/pom.xml
index bdde8327393..bdde8327393 100644
--- a/it/it-projects/batch/multi-languages/pom.xml
+++ b/it/it-projects/analysis/multi-languages/pom.xml
diff --git a/it/it-projects/batch/multi-languages/python-module/pom.xml b/it/it-projects/analysis/multi-languages/python-module/pom.xml
index 02520cd6de9..02520cd6de9 100644
--- a/it/it-projects/batch/multi-languages/python-module/pom.xml
+++ b/it/it-projects/analysis/multi-languages/python-module/pom.xml
diff --git a/it/it-projects/batch/multi-languages/python-module/src/__init__.py b/it/it-projects/analysis/multi-languages/python-module/src/__init__.py
index e69de29bb2d..e69de29bb2d 100644
--- a/it/it-projects/batch/multi-languages/python-module/src/__init__.py
+++ b/it/it-projects/analysis/multi-languages/python-module/src/__init__.py
diff --git a/it/it-projects/batch/multi-languages/python-module/src/badfortune.py b/it/it-projects/analysis/multi-languages/python-module/src/badfortune.py
index b0900dc1695..b0900dc1695 100644
--- a/it/it-projects/batch/multi-languages/python-module/src/badfortune.py
+++ b/it/it-projects/analysis/multi-languages/python-module/src/badfortune.py
diff --git a/it/it-projects/batch/multi-languages/sonar-project.properties b/it/it-projects/analysis/multi-languages/sonar-project.properties
index ab848fa49f4..ab848fa49f4 100644
--- a/it/it-projects/batch/multi-languages/sonar-project.properties
+++ b/it/it-projects/analysis/multi-languages/sonar-project.properties
diff --git a/it/it-projects/batch/prevent-common-module/projectAB/module_a/sonar-project.properties b/it/it-projects/analysis/prevent-common-module/projectAB/module_a/sonar-project.properties
index 7c95bd81729..7c95bd81729 100644
--- a/it/it-projects/batch/prevent-common-module/projectAB/module_a/sonar-project.properties
+++ b/it/it-projects/analysis/prevent-common-module/projectAB/module_a/sonar-project.properties
diff --git a/it/it-projects/batch/prevent-common-module/projectAB/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo b/it/it-projects/analysis/prevent-common-module/projectAB/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
index 74d29a4fa08..74d29a4fa08 100644
--- a/it/it-projects/batch/prevent-common-module/projectAB/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
+++ b/it/it-projects/analysis/prevent-common-module/projectAB/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
diff --git a/it/it-projects/batch/prevent-common-module/projectAB/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures b/it/it-projects/analysis/prevent-common-module/projectAB/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
index 7812e4167fb..7812e4167fb 100644
--- a/it/it-projects/batch/prevent-common-module/projectAB/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
+++ b/it/it-projects/analysis/prevent-common-module/projectAB/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
diff --git a/it/it-projects/batch/prevent-common-module/projectAB/module_b/sonar-project.properties b/it/it-projects/analysis/prevent-common-module/projectAB/module_b/sonar-project.properties
index 04cd79e2247..04cd79e2247 100644
--- a/it/it-projects/batch/prevent-common-module/projectAB/module_b/sonar-project.properties
+++ b/it/it-projects/analysis/prevent-common-module/projectAB/module_b/sonar-project.properties
diff --git a/it/it-projects/batch/prevent-common-module/projectAB/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo b/it/it-projects/analysis/prevent-common-module/projectAB/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
index 42039538a92..42039538a92 100644
--- a/it/it-projects/batch/prevent-common-module/projectAB/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
+++ b/it/it-projects/analysis/prevent-common-module/projectAB/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
diff --git a/it/it-projects/batch/prevent-common-module/projectAB/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures b/it/it-projects/analysis/prevent-common-module/projectAB/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
index 3947d3bdbff..3947d3bdbff 100644
--- a/it/it-projects/batch/prevent-common-module/projectAB/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
+++ b/it/it-projects/analysis/prevent-common-module/projectAB/module_b/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
diff --git a/it/it-projects/batch/prevent-common-module/projectAB/sonar-project.properties b/it/it-projects/analysis/prevent-common-module/projectAB/sonar-project.properties
index e3c23037ee1..e3c23037ee1 100644
--- a/it/it-projects/batch/prevent-common-module/projectAB/sonar-project.properties
+++ b/it/it-projects/analysis/prevent-common-module/projectAB/sonar-project.properties
diff --git a/it/it-projects/batch/prevent-common-module/projectAC/module_a/sonar-project.properties b/it/it-projects/analysis/prevent-common-module/projectAC/module_a/sonar-project.properties
index 7c95bd81729..7c95bd81729 100644
--- a/it/it-projects/batch/prevent-common-module/projectAC/module_a/sonar-project.properties
+++ b/it/it-projects/analysis/prevent-common-module/projectAC/module_a/sonar-project.properties
diff --git a/it/it-projects/batch/prevent-common-module/projectAC/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo b/it/it-projects/analysis/prevent-common-module/projectAC/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
index 74d29a4fa08..74d29a4fa08 100644
--- a/it/it-projects/batch/prevent-common-module/projectAC/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
+++ b/it/it-projects/analysis/prevent-common-module/projectAC/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo
diff --git a/it/it-projects/batch/prevent-common-module/projectAC/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures b/it/it-projects/analysis/prevent-common-module/projectAC/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
index 7812e4167fb..7812e4167fb 100644
--- a/it/it-projects/batch/prevent-common-module/projectAC/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
+++ b/it/it-projects/analysis/prevent-common-module/projectAC/module_a/src/main/xoo/com/sonar/it/samples/modules/a1/HelloA1.xoo.measures
diff --git a/it/it-projects/batch/prevent-common-module/projectAC/module_c/sonar-project.properties b/it/it-projects/analysis/prevent-common-module/projectAC/module_c/sonar-project.properties
index 670f26db1db..670f26db1db 100644
--- a/it/it-projects/batch/prevent-common-module/projectAC/module_c/sonar-project.properties
+++ b/it/it-projects/analysis/prevent-common-module/projectAC/module_c/sonar-project.properties
diff --git a/it/it-projects/batch/prevent-common-module/projectAC/module_c/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo b/it/it-projects/analysis/prevent-common-module/projectAC/module_c/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
index 42039538a92..42039538a92 100644
--- a/it/it-projects/batch/prevent-common-module/projectAC/module_c/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
+++ b/it/it-projects/analysis/prevent-common-module/projectAC/module_c/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo
diff --git a/it/it-projects/batch/prevent-common-module/projectAC/module_c/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures b/it/it-projects/analysis/prevent-common-module/projectAC/module_c/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
index 3947d3bdbff..3947d3bdbff 100644
--- a/it/it-projects/batch/prevent-common-module/projectAC/module_c/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
+++ b/it/it-projects/analysis/prevent-common-module/projectAC/module_c/src/main/xoo/com/sonar/it/samples/modules/a2/HelloA2.xoo.measures
diff --git a/it/it-projects/batch/prevent-common-module/projectAC/sonar-project.properties b/it/it-projects/analysis/prevent-common-module/projectAC/sonar-project.properties
index 342fb68ec8f..342fb68ec8f 100644
--- a/it/it-projects/batch/prevent-common-module/projectAC/sonar-project.properties
+++ b/it/it-projects/analysis/prevent-common-module/projectAC/sonar-project.properties
diff --git a/it/it-projects/batch/project-builder/module_a/src/HelloA.java b/it/it-projects/analysis/project-builder/module_a/src/HelloA.java
index 847098b9a50..847098b9a50 100644
--- a/it/it-projects/batch/project-builder/module_a/src/HelloA.java
+++ b/it/it-projects/analysis/project-builder/module_a/src/HelloA.java
diff --git a/it/it-projects/batch/project-builder/module_b/src/HelloB.java b/it/it-projects/analysis/project-builder/module_b/src/HelloB.java
index afc7d2c906c..afc7d2c906c 100644
--- a/it/it-projects/batch/project-builder/module_b/src/HelloB.java
+++ b/it/it-projects/analysis/project-builder/module_b/src/HelloB.java
diff --git a/it/it-projects/batch/project-builder/module_b/src/IgnoredFile.java b/it/it-projects/analysis/project-builder/module_b/src/IgnoredFile.java
index 9574c15b0ee..9574c15b0ee 100644
--- a/it/it-projects/batch/project-builder/module_b/src/IgnoredFile.java
+++ b/it/it-projects/analysis/project-builder/module_b/src/IgnoredFile.java
diff --git a/it/it-projects/batch/project-builder/pom.xml b/it/it-projects/analysis/project-builder/pom.xml
index e79f785f013..e79f785f013 100644
--- a/it/it-projects/batch/project-builder/pom.xml
+++ b/it/it-projects/analysis/project-builder/pom.xml
diff --git a/it/it-projects/batch/tracking/v1/sonar-project.properties b/it/it-projects/analysis/tracking/v1/sonar-project.properties
index e01f062e51b..e01f062e51b 100644
--- a/it/it-projects/batch/tracking/v1/sonar-project.properties
+++ b/it/it-projects/analysis/tracking/v1/sonar-project.properties
diff --git a/it/it-projects/batch/tracking/v1/src/main/xoo/sample/Sample.xoo b/it/it-projects/analysis/tracking/v1/src/main/xoo/sample/Sample.xoo
index b1210973dd9..b1210973dd9 100644
--- a/it/it-projects/batch/tracking/v1/src/main/xoo/sample/Sample.xoo
+++ b/it/it-projects/analysis/tracking/v1/src/main/xoo/sample/Sample.xoo
diff --git a/it/it-projects/batch/tracking/v1/src/main/xoo/sample/Sample.xoo.measures b/it/it-projects/analysis/tracking/v1/src/main/xoo/sample/Sample.xoo.measures
index 7bb5f438500..7bb5f438500 100644
--- a/it/it-projects/batch/tracking/v1/src/main/xoo/sample/Sample.xoo.measures
+++ b/it/it-projects/analysis/tracking/v1/src/main/xoo/sample/Sample.xoo.measures
diff --git a/it/it-projects/batch/tracking/v2/sonar-project.properties b/it/it-projects/analysis/tracking/v2/sonar-project.properties
index e01f062e51b..e01f062e51b 100644
--- a/it/it-projects/batch/tracking/v2/sonar-project.properties
+++ b/it/it-projects/analysis/tracking/v2/sonar-project.properties
diff --git a/it/it-projects/batch/tracking/v2/src/main/xoo/sample/Sample.xoo b/it/it-projects/analysis/tracking/v2/src/main/xoo/sample/Sample.xoo
index 3f624a15b08..3f624a15b08 100644
--- a/it/it-projects/batch/tracking/v2/src/main/xoo/sample/Sample.xoo
+++ b/it/it-projects/analysis/tracking/v2/src/main/xoo/sample/Sample.xoo
diff --git a/it/it-projects/batch/tracking/v2/src/main/xoo/sample/Sample.xoo.measures b/it/it-projects/analysis/tracking/v2/src/main/xoo/sample/Sample.xoo.measures
index 69a10eb19d4..69a10eb19d4 100644
--- a/it/it-projects/batch/tracking/v2/src/main/xoo/sample/Sample.xoo.measures
+++ b/it/it-projects/analysis/tracking/v2/src/main/xoo/sample/Sample.xoo.measures
diff --git a/it/it-projects/batch/xoo-history-v2/sonar-project.properties b/it/it-projects/analysis/xoo-history-v2/sonar-project.properties
index e01f062e51b..e01f062e51b 100644
--- a/it/it-projects/batch/xoo-history-v2/sonar-project.properties
+++ b/it/it-projects/analysis/xoo-history-v2/sonar-project.properties
diff --git a/it/it-projects/batch/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo b/it/it-projects/analysis/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo
index b0fd1087030..b0fd1087030 100644
--- a/it/it-projects/batch/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo
+++ b/it/it-projects/analysis/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo
diff --git a/it/it-projects/batch/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo.measures b/it/it-projects/analysis/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo.measures
index 66ba834e1ef..66ba834e1ef 100644
--- a/it/it-projects/batch/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo.measures
+++ b/it/it-projects/analysis/xoo-history-v2/src/main/xoo/sample/ClassAdded.xoo.measures
diff --git a/it/it-projects/batch/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo b/it/it-projects/analysis/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo
index 393111bbab0..393111bbab0 100644
--- a/it/it-projects/batch/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo
+++ b/it/it-projects/analysis/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo
diff --git a/it/it-projects/batch/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo.measures b/it/it-projects/analysis/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo.measures
index 71d60758637..71d60758637 100644
--- a/it/it-projects/batch/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo.measures
+++ b/it/it-projects/analysis/xoo-history-v2/src/main/xoo/sample/ClassToModify.xoo.measures
diff --git a/it/it-projects/batch/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo b/it/it-projects/analysis/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo
index 2b0288fc971..2b0288fc971 100644
--- a/it/it-projects/batch/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo
+++ b/it/it-projects/analysis/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo
diff --git a/it/it-projects/batch/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo.measures b/it/it-projects/analysis/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo.measures
index 7812e4167fb..7812e4167fb 100644
--- a/it/it-projects/batch/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo.measures
+++ b/it/it-projects/analysis/xoo-history-v2/src/main/xoo/sample/UnchangedClass.xoo.measures
diff --git a/it/it-projects/batch/xoo-multi-languages/sonar-project.properties b/it/it-projects/analysis/xoo-multi-languages/sonar-project.properties
index a2941788c41..a2941788c41 100644
--- a/it/it-projects/batch/xoo-multi-languages/sonar-project.properties
+++ b/it/it-projects/analysis/xoo-multi-languages/sonar-project.properties
diff --git a/it/it-projects/batch/xoo-multi-languages/src/sample/Sample.xoo b/it/it-projects/analysis/xoo-multi-languages/src/sample/Sample.xoo
index b1210973dd9..b1210973dd9 100644
--- a/it/it-projects/batch/xoo-multi-languages/src/sample/Sample.xoo
+++ b/it/it-projects/analysis/xoo-multi-languages/src/sample/Sample.xoo
diff --git a/it/it-projects/batch/xoo-multi-languages/src/sample/Sample.xoo.measures b/it/it-projects/analysis/xoo-multi-languages/src/sample/Sample.xoo.measures
index ab1671431fc..ab1671431fc 100644
--- a/it/it-projects/batch/xoo-multi-languages/src/sample/Sample.xoo.measures
+++ b/it/it-projects/analysis/xoo-multi-languages/src/sample/Sample.xoo.measures
diff --git a/it/it-projects/batch/xoo-multi-languages/src/sample/Sample.xoo2 b/it/it-projects/analysis/xoo-multi-languages/src/sample/Sample.xoo2
index b1210973dd9..b1210973dd9 100644
--- a/it/it-projects/batch/xoo-multi-languages/src/sample/Sample.xoo2
+++ b/it/it-projects/analysis/xoo-multi-languages/src/sample/Sample.xoo2
diff --git a/it/it-projects/batch/xoo-multi-languages/src/sample/Sample.xoo2.measures b/it/it-projects/analysis/xoo-multi-languages/src/sample/Sample.xoo2.measures
index ab1671431fc..ab1671431fc 100644
--- a/it/it-projects/batch/xoo-multi-languages/src/sample/Sample.xoo2.measures
+++ b/it/it-projects/analysis/xoo-multi-languages/src/sample/Sample.xoo2.measures
diff --git a/it/it-projects/batch/xoo-sample-with-spaces/v1/my sources/main/xoo/sample/My Sample.xoo b/it/it-projects/analysis/xoo-sample-with-spaces/v1/my sources/main/xoo/sample/My Sample.xoo
index b1210973dd9..b1210973dd9 100644
--- a/it/it-projects/batch/xoo-sample-with-spaces/v1/my sources/main/xoo/sample/My Sample.xoo
+++ b/it/it-projects/analysis/xoo-sample-with-spaces/v1/my sources/main/xoo/sample/My Sample.xoo
diff --git a/it/it-projects/batch/xoo-sample-with-spaces/v1/my sources/main/xoo/sample/My Sample.xoo.measures b/it/it-projects/analysis/xoo-sample-with-spaces/v1/my sources/main/xoo/sample/My Sample.xoo.measures
index 3f73ea8f695..3f73ea8f695 100644
--- a/it/it-projects/batch/xoo-sample-with-spaces/v1/my sources/main/xoo/sample/My Sample.xoo.measures
+++ b/it/it-projects/analysis/xoo-sample-with-spaces/v1/my sources/main/xoo/sample/My Sample.xoo.measures
diff --git a/it/it-projects/batch/xoo-sample-with-spaces/v1/sonar-project.properties b/it/it-projects/analysis/xoo-sample-with-spaces/v1/sonar-project.properties
index bae5f7f152c..bae5f7f152c 100644
--- a/it/it-projects/batch/xoo-sample-with-spaces/v1/sonar-project.properties
+++ b/it/it-projects/analysis/xoo-sample-with-spaces/v1/sonar-project.properties
diff --git a/it/it-projects/batch/xoo-sample-with-spaces/v2/my sources/main/xoo/sample/My Sample.xoo b/it/it-projects/analysis/xoo-sample-with-spaces/v2/my sources/main/xoo/sample/My Sample.xoo
index 8c91df8b6cf..8c91df8b6cf 100644
--- a/it/it-projects/batch/xoo-sample-with-spaces/v2/my sources/main/xoo/sample/My Sample.xoo
+++ b/it/it-projects/analysis/xoo-sample-with-spaces/v2/my sources/main/xoo/sample/My Sample.xoo
diff --git a/it/it-projects/batch/xoo-sample-with-spaces/v2/my sources/main/xoo/sample/My Sample.xoo.measures b/it/it-projects/analysis/xoo-sample-with-spaces/v2/my sources/main/xoo/sample/My Sample.xoo.measures
index 3f73ea8f695..3f73ea8f695 100644
--- a/it/it-projects/batch/xoo-sample-with-spaces/v2/my sources/main/xoo/sample/My Sample.xoo.measures
+++ b/it/it-projects/analysis/xoo-sample-with-spaces/v2/my sources/main/xoo/sample/My Sample.xoo.measures
diff --git a/it/it-projects/batch/xoo-sample-with-spaces/v2/sonar-project.properties b/it/it-projects/analysis/xoo-sample-with-spaces/v2/sonar-project.properties
index bae5f7f152c..bae5f7f152c 100644
--- a/it/it-projects/batch/xoo-sample-with-spaces/v2/sonar-project.properties
+++ b/it/it-projects/analysis/xoo-sample-with-spaces/v2/sonar-project.properties
diff --git a/it/it-tests/pom.xml b/it/it-tests/pom.xml
index 07b81d1e915..dcfa3781898 100644
--- a/it/it-tests/pom.xml
+++ b/it/it-tests/pom.xml
@@ -12,8 +12,7 @@
   <name>SonarQube Integration Tests :: Tests</name>
 
   <properties>
-    <category1>*</category1>
-    <category2>NONE</category2>
+    <category>*</category>
     <skipIts>false</skipIts>
   </properties>
 
@@ -22,7 +21,7 @@
     <dependency>
       <groupId>org.sonarsource.orchestrator</groupId>
       <artifactId>sonar-orchestrator</artifactId>
-      <version>3.5</version>
+      <version>3.6</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -109,16 +108,8 @@
           <argLine>-Xmx128m -Dsonar.runtimeVersion=${project.version}</argLine>
           <skipTests>${skipIts}</skipTests>
           <includes>
-            <include>${category1}/suite/*TestSuite.java</include>
-            <include>${category2}/suite/*TestSuite.java</include>
-            <!-- not included in suites -->
-            <include>${category1}/*Test.java</include>
-            <include>${category2}/*Test.java</include>
+            <include>*/${category}Suite.java</include>
           </includes>
-          <excludes>
-            <!-- included into suites -->
-            <exclude>*/suite/*Test.java</exclude>
-          </excludes>
         </configuration>
       </plugin>
     </plugins>
diff --git a/it/it-tests/src/test/java/analysis/suite/AnalysisTestSuite.java b/it/it-tests/src/test/java/analysis/suite/AnalysisTestSuite.java
deleted file mode 100644
index d0ee8260910..00000000000
--- a/it/it-tests/src/test/java/analysis/suite/AnalysisTestSuite.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * SonarQube is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * SonarQube is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-package analysis.suite;
-
-import analysis.suite.measure.CustomMeasuresTest;
-import analysis.suite.measure.DifferentialPeriodsTest;
-import analysis.suite.measure.MeasureFiltersTest;
-import analysis.suite.measure.NewDebtRatioMeasureTest;
-import analysis.suite.measure.TechnicalDebtMeasureVariationTest;
-import analysis.suite.measure.TimeMachineTest;
-import analysis.suite.testing.CoverageTest;
-import analysis.suite.testing.CoverageTrackingTest;
-import analysis.suite.testing.NewCoverageTest;
-import analysis.suite.testing.TestExecutionTest;
-import com.sonar.orchestrator.Orchestrator;
-import org.junit.ClassRule;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import util.ItUtils;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-  CustomMeasuresTest.class,
-  DifferentialPeriodsTest.class,
-  MeasureFiltersTest.class,
-  TimeMachineTest.class,
-  CoverageTrackingTest.class,
-  CoverageTest.class,
-  NewCoverageTest.class,
-  TestExecutionTest.class,
-  TechnicalDebtMeasureVariationTest.class,
-  NewDebtRatioMeasureTest.class
-})
-public class AnalysisTestSuite {
-
-  @ClassRule
-  public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
-    .addPlugin(ItUtils.xooPlugin())
-    .build();
-}
diff --git a/it/it-tests/src/test/java/batch/suite/BatchTestSuite.java b/it/it-tests/src/test/java/batch/suite/BatchTestSuite.java
deleted file mode 100644
index eccc74a4868..00000000000
--- a/it/it-tests/src/test/java/batch/suite/BatchTestSuite.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2009-2014 SonarSource SA
- * All rights reserved
- * mailto:contact AT sonarsource DOT com
- */
-package batch.suite;
-
-import com.sonar.orchestrator.Orchestrator;
-import org.junit.ClassRule;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import util.ItUtils;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-  ExtensionLifecycleTest.class, LinksTest.class, MavenTest.class, ProjectBuilderTest.class, ProjectExclusionsTest.class,
-  TempFolderTest.class, MultiLanguageTest.class, IssueJsonReportTest.class, ProjectProvisioningTest.class, BatchTest.class,
-  IssuesModeTest.class, SettingsEncryptionTest.class
-})
-public class BatchTestSuite {
-
-  @ClassRule
-  public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
-    .addPlugin(ItUtils.xooPlugin())
-    .setOrchestratorProperty("javaVersion", "LATEST_RELEASE").addPlugin("java")
-    .setContext("/")
-
-    // Used by SettingsEncryptionTest
-    .addPlugin(ItUtils.pluginArtifact("settings-encryption-plugin"))
-
-    // Used by IssuesModeTest
-    .addPlugin(ItUtils.pluginArtifact("access-secured-props-plugin"))
-
-    // used by TempFolderTest
-    .addPlugin(ItUtils.pluginArtifact("batch-plugin"))
-
-    // used by ExtensionLifecycleTest
-    .addPlugin(ItUtils.pluginArtifact("extension-lifecycle-plugin"))
-
-    // used by ProjectBuilderTest
-    .addPlugin(ItUtils.pluginArtifact("project-builder-plugin"))
-
-    .build();
-}
diff --git a/it/it-tests/src/test/java/duplications/suite/DuplicationsTestSuite.java b/it/it-tests/src/test/java/duplications/suite/DuplicationsTestSuite.java
deleted file mode 100644
index 4cffa398e97..00000000000
--- a/it/it-tests/src/test/java/duplications/suite/DuplicationsTestSuite.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2009-2014 SonarSource SA
- * All rights reserved
- * mailto:contact AT sonarsource DOT com
- */
-package duplications.suite;
-
-import com.sonar.orchestrator.Orchestrator;
-import org.junit.ClassRule;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-  CrossProjectDuplicationsTest.class, DuplicationsTest.class
-})
-public class DuplicationsTestSuite {
-
-  @ClassRule
-  public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
-    .setOrchestratorProperty("javaVersion", "LATEST_RELEASE").addPlugin("java")
-    .build();
-}
diff --git a/it/it-tests/src/test/java/exclusions/suite/ExclusionsTestSuite.java b/it/it-tests/src/test/java/exclusions/suite/ExclusionsTestSuite.java
deleted file mode 100644
index ff89627c2c9..00000000000
--- a/it/it-tests/src/test/java/exclusions/suite/ExclusionsTestSuite.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2009-2014 SonarSource SA
- * All rights reserved
- * mailto:contact AT sonarsource DOT com
- */
-package exclusions.suite;
-
-import util.ItUtils;
-
-import com.sonar.orchestrator.Orchestrator;
-import org.junit.ClassRule;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-  FileExclusionsTest.class, IssueExclusionsTest.class
-})
-public class ExclusionsTestSuite {
-
-  @ClassRule
-  public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
-    .addPlugin(ItUtils.xooPlugin())
-    .build();
-}
diff --git a/it/it-tests/src/test/java/it/Category1Suite.java b/it/it-tests/src/test/java/it/Category1Suite.java
new file mode 100644
index 00000000000..ea62d8074ec
--- /dev/null
+++ b/it/it-tests/src/test/java/it/Category1Suite.java
@@ -0,0 +1,100 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package it;/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+import com.sonar.orchestrator.Orchestrator;
+import it.i18n.I18nTest;
+import it.permission.IssuePermissionTest;
+import it.projectAdministration.BulkDeletionTest;
+import it.projectAdministration.ProjectAdministrationTest;
+import it.qualityGate.QualityGateNotificationTest;
+import it.qualityGate.QualityGateTest;
+import it.settings.PropertySetsTest;
+import it.settings.SettingsTest;
+import it.settings.SettingsTestRestartingOrchestrator;
+import it.settings.SubCategoriesTest;
+import org.junit.ClassRule;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+import static util.ItUtils.pluginArtifact;
+import static util.ItUtils.xooPlugin;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+  // project administration
+  BulkDeletionTest.class,
+  ProjectAdministrationTest.class,
+  // settings
+  PropertySetsTest.class,
+  SubCategoriesTest.class,
+  SettingsTest.class,
+  SettingsTestRestartingOrchestrator.class,
+  // i18n
+  I18nTest.class,
+  // quality gate
+  QualityGateTest.class,
+  QualityGateNotificationTest.class,
+  // permission
+  IssuePermissionTest.class
+})
+public class Category1Suite {
+
+  @ClassRule
+  public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
+    .setServerProperty("sonar.notifications.delay", "1")
+    .addPlugin(pluginArtifact("property-sets-plugin"))
+    .addPlugin(pluginArtifact("sonar-subcategories-plugin"))
+
+    // Used in I18nTest
+    .addPlugin(pluginArtifact("l10n-fr-pack"))
+
+    // 1 second. Required for notification test.
+    .setServerProperty("sonar.notifications.delay", "1")
+
+    // Used in SettingsTest.global_property_change_extension_point
+    .addPlugin(pluginArtifact("global-property-change-plugin"))
+
+    // Used in SettingsTest.should_get_settings_default_value
+    .addPlugin(pluginArtifact("server-plugin"))
+
+    .addPlugin(xooPlugin())
+    .build();
+
+}
diff --git a/it/it-tests/src/test/java/it/Category2Suite.java b/it/it-tests/src/test/java/it/Category2Suite.java
new file mode 100644
index 00000000000..27cd9dd6b22
--- /dev/null
+++ b/it/it-tests/src/test/java/it/Category2Suite.java
@@ -0,0 +1,107 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package it;/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+import com.sonar.orchestrator.Orchestrator;
+import it.customMeasure.CustomMeasuresTest;
+import it.issue.CommonRulesTest;
+import it.issue.CustomRulesTest;
+import it.issue.IssueActionTest;
+import it.issue.IssueBulkChangeTest;
+import it.issue.IssueChangelogTest;
+import it.issue.IssueFilterExtensionTest;
+import it.issue.IssuePurgeTest;
+import it.issue.IssueWorkflowTest;
+import it.issue.ManualRulesTest;
+import it.measureFilter.MeasureFiltersTest;
+import it.measure.NewDebtRatioMeasureTest;
+import it.measure.TechnicalDebtMeasureVariationTest;
+import it.measureHistory.DifferentialPeriodsTest;
+import it.measureHistory.TimeMachineTest;
+import it.test.CoverageTest;
+import it.test.CoverageTrackingTest;
+import it.test.NewCoverageTest;
+import it.test.TestExecutionTest;
+import org.junit.ClassRule;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+import static util.ItUtils.pluginArtifact;
+import static util.ItUtils.xooPlugin;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+  // custom measure
+  CustomMeasuresTest.class,
+  // measure history
+  DifferentialPeriodsTest.class,
+  TimeMachineTest.class,
+  // measure
+  TechnicalDebtMeasureVariationTest.class,
+  NewDebtRatioMeasureTest.class,
+  MeasureFiltersTest.class,
+  // test
+  CoverageTrackingTest.class,
+  CoverageTest.class,
+  NewCoverageTest.class,
+  TestExecutionTest.class,
+  // issue
+  CommonRulesTest.class,
+  IssueWorkflowTest.class,
+  ManualRulesTest.class,
+  CustomRulesTest.class,
+  IssueActionTest.class,
+  IssueChangelogTest.class,
+  IssueBulkChangeTest.class,
+  IssuePurgeTest.class,
+  IssueFilterExtensionTest.class
+})
+public class Category2Suite {
+
+  @ClassRule
+  public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
+    .addPlugin(xooPlugin())
+
+    // issue
+    .addPlugin(pluginArtifact("issue-action-plugin"))
+    .addPlugin(pluginArtifact("issue-filter-plugin"))
+
+    .build();
+
+}
diff --git a/it/it-tests/src/test/java/it/Category3Suite.java b/it/it-tests/src/test/java/it/Category3Suite.java
new file mode 100644
index 00000000000..a997d042931
--- /dev/null
+++ b/it/it-tests/src/test/java/it/Category3Suite.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2009-2014 SonarSource SA
+ * All rights reserved
+ * mailto:contact AT sonarsource DOT com
+ */
+package it;
+
+import com.sonar.orchestrator.Orchestrator;
+import it.analysis.BatchTest;
+import it.analysis.ExtensionLifecycleTest;
+import it.analysis.IssueJsonReportTest;
+import it.analysis.IssuesModeTest;
+import it.analysis.LinksTest;
+import it.analysis.MavenTest;
+import it.analysis.MultiLanguageTest;
+import it.analysis.ProjectBuilderTest;
+import it.analysis.ProjectExclusionsTest;
+import it.analysis.ProjectProvisioningTest;
+import it.analysis.SettingsEncryptionTest;
+import it.analysis.TempFolderTest;
+import it.analysisExclusion.FileExclusionsTest;
+import it.analysisExclusion.IssueExclusionsTest;
+import it.duplication.CrossProjectDuplicationsTest;
+import it.duplication.DuplicationsTest;
+import org.junit.ClassRule;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+import static util.ItUtils.pluginArtifact;
+import static util.ItUtils.xooPlugin;
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+  // analysis
+  ExtensionLifecycleTest.class,
+  LinksTest.class,
+  MavenTest.class,
+  ProjectBuilderTest.class,
+  ProjectExclusionsTest.class,
+  TempFolderTest.class,
+  MultiLanguageTest.class,
+  IssueJsonReportTest.class,
+  ProjectProvisioningTest.class,
+  BatchTest.class,
+  IssuesModeTest.class,
+  SettingsEncryptionTest.class
+})
+public class Category3Suite {
+
+  @ClassRule
+  public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
+    .addPlugin(xooPlugin())
+    .setOrchestratorProperty("javaVersion", "LATEST_RELEASE").addPlugin("java")
+    .setContext("/")
+
+    // Used by SettingsEncryptionTest
+    .addPlugin(pluginArtifact("settings-encryption-plugin"))
+
+    // Used by IssuesModeTest
+    .addPlugin(pluginArtifact("access-secured-props-plugin"))
+
+    // used by TempFolderTest
+    .addPlugin(pluginArtifact("batch-plugin"))
+
+    // used by ExtensionLifecycleTest
+    .addPlugin(pluginArtifact("extension-lifecycle-plugin"))
+
+    // used by ProjectBuilderTest
+    .addPlugin(pluginArtifact("project-builder-plugin"))
+
+    .build();
+}
diff --git a/it/it-tests/src/test/java/administration/suite/AdministrationTestSuite.java b/it/it-tests/src/test/java/it/Category4Suite.java
index 6eca10ab2bd..7c08e8e7759 100644
--- a/it/it-tests/src/test/java/administration/suite/AdministrationTestSuite.java
+++ b/it/it-tests/src/test/java/it/Category4Suite.java
@@ -17,40 +17,53 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package administration.suite;
+package it;
 
-import administration.suite.administration.BulkDeletionTest;
-import administration.suite.administration.ProjectAdministrationTest;
-import administration.suite.administration.PropertySetsTest;
-import administration.suite.administration.SubCategoriesTest;
-import administration.suite.ui.I18nTest;
 import com.sonar.orchestrator.Orchestrator;
+import it.analysisExclusion.FileExclusionsTest;
+import it.analysisExclusion.IssueExclusionsTest;
+import it.componentSearch.ProjectSearchTest;
+import it.duplication.CrossProjectDuplicationsTest;
+import it.duplication.DuplicationsTest;
+import it.serverSystem.DevModeTest;
+import it.serverSystem.HttpsTest;
+import it.serverSystem.ServerSystemRestartingOrchestrator;
+import it.serverSystem.ServerSystemTest;
+import it.updateCenter.UpdateCenterTest;
+import it.user.FavouriteTest;
+import it.user.ForceAuthenticationTest;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
-import util.ItUtils;
 
-import static util.ItUtils.pluginArtifact;
+import static util.ItUtils.xooPlugin;
 
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
-  BulkDeletionTest.class,
-  ProjectAdministrationTest.class,
-  PropertySetsTest.class,
-  SubCategoriesTest.class,
-  I18nTest.class
+  // server system
+  DevModeTest.class,
+  HttpsTest.class,
+  ServerSystemTest.class,
+  ServerSystemRestartingOrchestrator.class,
+  // user
+  ForceAuthenticationTest.class,
+  FavouriteTest.class,
+  // project search
+  ProjectSearchTest.class,
+  // update center
+  UpdateCenterTest.class,
+  // analysis exclusion
+  FileExclusionsTest.class,
+  IssueExclusionsTest.class,
+  // duplication
+  CrossProjectDuplicationsTest.class,
+  DuplicationsTest.class
 })
-public class AdministrationTestSuite {
+public class Category4Suite {
 
   @ClassRule
   public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
-    .setServerProperty("sonar.notifications.delay", "1")
-    .addPlugin(ItUtils.pluginArtifact("property-sets-plugin"))
-    .addPlugin(ItUtils.pluginArtifact("sonar-subcategories-plugin"))
-
-    // Used in I18nTest
-    .addPlugin(pluginArtifact("l10n-fr-pack"))
-
-    .addPlugin(ItUtils.xooPlugin())
+    .addPlugin(xooPlugin())
+    .setOrchestratorProperty("javaVersion", "LATEST_RELEASE").addPlugin("java")
     .build();
 }
diff --git a/it/it-tests/src/test/java/permission/suite/PermissionTestSuite.java b/it/it-tests/src/test/java/it/PluginsSuite.java
index a3054f91525..72e91d80e42 100644
--- a/it/it-tests/src/test/java/permission/suite/PermissionTestSuite.java
+++ b/it/it-tests/src/test/java/it/PluginsSuite.java
@@ -17,23 +17,17 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package permission.suite;
 
-import com.sonar.orchestrator.Orchestrator;
-import org.junit.ClassRule;
+package it;
+
+import it.plugins.PluginsTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
-import static util.ItUtils.xooPlugin;
-
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
-  IssuePermissionTest.class
+  PluginsTest.class,
 })
-public class PermissionTestSuite {
+public class PluginsSuite {
 
-  @ClassRule
-  public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
-    .addPlugin(xooPlugin())
-    .build();
 }
diff --git a/it/it-tests/src/test/java/batch/suite/BatchTest.java b/it/it-tests/src/test/java/it/analysis/BatchTest.java
index beb8733967b..f6a2e5bb199 100644
--- a/it/it-tests/src/test/java/batch/suite/BatchTest.java
+++ b/it/it-tests/src/test/java/it/analysis/BatchTest.java
@@ -3,13 +3,14 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package batch.suite;
+package it.analysis;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.BuildFailureException;
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.SonarRunner;
 import com.sonar.orchestrator.locator.FileLocation;
+import it.Category3Suite;
 import java.io.File;
 import java.io.IOException;
 import java.util.Date;
@@ -34,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class BatchTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = BatchTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category3Suite.ORCHESTRATOR;
 
   @Rule
   public ExpectedException thrown = ExpectedException.none();
@@ -45,7 +46,7 @@ public class BatchTest {
   @Before
   public void deleteData() {
     orchestrator.resetData();
-    orchestrator.getServer().restoreProfile(FileLocation.ofClasspath("/batch/BatchTest/one-issue-per-line.xml"));
+    orchestrator.getServer().restoreProfile(FileLocation.ofClasspath("/analysis/BatchTest/one-issue-per-line.xml"));
   }
 
   /** 
@@ -178,7 +179,7 @@ public class BatchTest {
   public void should_support_source_files_with_same_deprecated_key() {
     orchestrator.getServer().provisionProject("com.sonarsource.it.projects.batch:duplicate-source", "exclusions");
     orchestrator.getServer().associateProjectToQualityProfile("com.sonarsource.it.projects.batch:duplicate-source", "xoo", "one-issue-per-line");
-    scan("batch/duplicate-source");
+    scan("analysis/duplicate-source");
 
     Sonar sonar = orchestrator.getServer().getAdminWsClient();
     Resource project = sonar.find(new ResourceQuery("com.sonarsource.it.projects.batch:duplicate-source").setMetrics("files", "directories"));
@@ -401,7 +402,7 @@ public class BatchTest {
   public void file_extensions_are_case_insensitive() throws Exception {
     orchestrator.getServer().provisionProject("case-sensitive-file-extensions", "Case Sensitive");
     orchestrator.getServer().associateProjectToQualityProfile("case-sensitive-file-extensions", "xoo", "one-issue-per-line");
-    scan("batch/case-sensitive-file-extensions");
+    scan("analysis/case-sensitive-file-extensions");
 
     Resource project = orchestrator.getServer().getWsClient().find(ResourceQuery.createForMetrics("case-sensitive-file-extensions", "files", "ncloc"));
     assertThat(project.getMeasureIntValue("files")).isEqualTo(2);
@@ -415,7 +416,7 @@ public class BatchTest {
   public void custom_module_key() {
     orchestrator.getServer().provisionProject("com.sonarsource.it.samples:multi-modules-sample", "Sonar :: Integration Tests :: Multi-modules Sample");
     orchestrator.getServer().associateProjectToQualityProfile("com.sonarsource.it.samples:multi-modules-sample", "xoo", "one-issue-per-line");
-    scan("batch/custom-module-key");
+    scan("analysis/custom-module-key");
     assertThat(getResource("com.sonarsource.it.samples:moduleA")).isNotNull();
     assertThat(getResource("com.sonarsource.it.samples:moduleB")).isNotNull();
   }
@@ -428,14 +429,14 @@ public class BatchTest {
   public void prevent_same_module_key_in_two_projects() {
     orchestrator.getServer().provisionProject("projectAB", "project AB");
     orchestrator.getServer().associateProjectToQualityProfile("projectAB", "xoo", "one-issue-per-line");
-    scan("batch/prevent-common-module/projectAB");
+    scan("analysis/prevent-common-module/projectAB");
     assertThat(getResource("com.sonarsource.it.samples:moduleA")).isNotNull();
     assertThat(getResource("com.sonarsource.it.samples:moduleB")).isNotNull();
 
     orchestrator.getServer().provisionProject("projectAC", "project AC");
     orchestrator.getServer().associateProjectToQualityProfile("projectAC", "xoo", "one-issue-per-line");
 
-    BuildResult result = scanQuietly("batch/prevent-common-module/projectAC");
+    BuildResult result = scanQuietly("analysis/prevent-common-module/projectAC");
     assertThat(result.getStatus()).isNotEqualTo(0);
     assertThat(result.getLogs()).contains("Module \"com.sonarsource.it.samples:moduleA\" is already part of project \"projectAB\"");
   }
diff --git a/it/it-tests/src/test/java/batch/suite/ExtensionLifecycleTest.java b/it/it-tests/src/test/java/it/analysis/ExtensionLifecycleTest.java
index ff8fe05118e..de8c785c12e 100644
--- a/it/it-tests/src/test/java/batch/suite/ExtensionLifecycleTest.java
+++ b/it/it-tests/src/test/java/it/analysis/ExtensionLifecycleTest.java
@@ -3,20 +3,20 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package batch.suite;
-
-import util.ItUtils;
+package it.analysis;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.MavenBuild;
+import it.Category3Suite;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
+import util.ItUtils;
 
 public class ExtensionLifecycleTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = BatchTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category3Suite.ORCHESTRATOR;
 
   @Before
   public void cleanup() {
@@ -25,7 +25,7 @@ public class ExtensionLifecycleTest {
 
   @Test
   public void testInstantiationStrategyAndLifecycleOfBatchExtensions() {
-    MavenBuild build = MavenBuild.create(ItUtils.projectPom("batch/extension-lifecycle"))
+    MavenBuild build = MavenBuild.create(ItUtils.projectPom("analysis/extension-lifecycle"))
       .setCleanSonarGoals()
       .setProperty("extension.lifecycle", "true")
       .setProperty("sonar.dynamicAnalysis", "false");
diff --git a/it/it-tests/src/test/java/batch/suite/IssueJsonReportTest.java b/it/it-tests/src/test/java/it/analysis/IssueJsonReportTest.java
index 8442467743c..6c2d1cd4e5a 100644
--- a/it/it-tests/src/test/java/batch/suite/IssueJsonReportTest.java
+++ b/it/it-tests/src/test/java/it/analysis/IssueJsonReportTest.java
@@ -3,12 +3,13 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package batch.suite;
+package it.analysis;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
 import com.sonar.orchestrator.locator.FileLocation;
 import com.sonar.orchestrator.locator.ResourceLocation;
+import it.Category3Suite;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.InputStream;
@@ -27,7 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class IssueJsonReportTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = BatchTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category3Suite.ORCHESTRATOR;
 
   @Rule
   public TemporaryFolder temp = new TemporaryFolder();
@@ -43,7 +44,7 @@ public class IssueJsonReportTest {
     orchestrator.getServer().provisionProject("sample", "tracking");
     orchestrator.getServer().associateProjectToQualityProfile("sample", "xoo", "one-issue-per-line");
 
-    File projectDir = ItUtils.projectDir("batch/tracking/v1");
+    File projectDir = ItUtils.projectDir("analysis/tracking/v1");
     SonarRunner issuesModeScan = SonarRunner.create(projectDir)
       .setProperty("sonar.analysis.mode", "issues")
       .setProperty("sonar.userHome", temp.newFolder().getAbsolutePath())
@@ -65,12 +66,12 @@ public class IssueJsonReportTest {
     orchestrator.getServer().provisionProject("sample", "tracking");
     orchestrator.getServer().associateProjectToQualityProfile("sample", "xoo", "one-issue-per-line");
 
-    SonarRunner scan = SonarRunner.create(ItUtils.projectDir("batch/tracking/v1"))
+    SonarRunner scan = SonarRunner.create(ItUtils.projectDir("analysis/tracking/v1"))
       .setProperty("sonar.projectDate", "2013-05-01");
     orchestrator.executeBuild(scan);
 
     // Issues mode scan -> 2 new issues and 13 existing issues
-    File projectDir = ItUtils.projectDir("batch/tracking/v2");
+    File projectDir = ItUtils.projectDir("analysis/tracking/v2");
     SonarRunner issuesModeScan = SonarRunner.create(projectDir)
       .setProperty("sonar.analysis.mode", "issues")
       .setProperty("sonar.userHome", temp.newFolder().getAbsolutePath())
@@ -92,13 +93,13 @@ public class IssueJsonReportTest {
     orchestrator.getServer().provisionProject("sample:mybranch", "Sample");
     orchestrator.getServer().associateProjectToQualityProfile("sample:mybranch", "xoo", "one-issue-per-line");
 
-    SonarRunner scan = SonarRunner.create(ItUtils.projectDir("batch/tracking/v1"))
+    SonarRunner scan = SonarRunner.create(ItUtils.projectDir("analysis/tracking/v1"))
       .setProperty("sonar.projectDate", "2013-05-01")
       .setProperty("sonar.branch", "mybranch");
     orchestrator.executeBuild(scan);
 
     // issues mode scan -> 2 new issues and 13 existing issues
-    File projectDir = ItUtils.projectDir("batch/tracking/v2");
+    File projectDir = ItUtils.projectDir("analysis/tracking/v2");
     SonarRunner issuesModeScan = SonarRunner.create(projectDir)
       .setProperty("sonar.analysis.mode", "issues")
       .setProperty("sonar.userHome", temp.newFolder().getAbsolutePath())
@@ -205,7 +206,7 @@ public class IssueJsonReportTest {
   }
 
   private ResourceLocation getResource(String resource) {
-    return FileLocation.ofClasspath("/batch/IssueJsonReportTest/" + resource);
+    return FileLocation.ofClasspath("/analysis/IssueJsonReportTest/" + resource);
   }
 
 }
diff --git a/it/it-tests/src/test/java/batch/suite/IssuesModeTest.java b/it/it-tests/src/test/java/it/analysis/IssuesModeTest.java
index 6b448214c7b..f598908ca47 100644
--- a/it/it-tests/src/test/java/batch/suite/IssuesModeTest.java
+++ b/it/it-tests/src/test/java/it/analysis/IssuesModeTest.java
@@ -3,7 +3,7 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package batch.suite;
+package it.analysis;
 
 import com.google.common.collect.Maps;
 import com.sonar.orchestrator.Orchestrator;
@@ -14,6 +14,7 @@ import com.sonar.orchestrator.build.SonarRunnerInstaller;
 import com.sonar.orchestrator.config.FileSystem;
 import com.sonar.orchestrator.locator.FileLocation;
 import com.sonar.orchestrator.version.Version;
+import it.Category3Suite;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -47,7 +48,7 @@ import static org.junit.Assert.fail;
 public class IssuesModeTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = BatchTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category3Suite.ORCHESTRATOR;
 
   @Rule
   public ExpectedException thrown = ExpectedException.none();
@@ -107,11 +108,11 @@ public class IssuesModeTest {
     orchestrator.getServer().provisionProject("sample", "xoo-sample-with-spaces");
     orchestrator.getServer().associateProjectToQualityProfile("sample", "xoo", "with-many-rules");
 
-    SonarRunner runner = configureRunner("batch/xoo-sample-with-spaces/v2");
+    SonarRunner runner = configureRunner("analysis/xoo-sample-with-spaces/v2");
     BuildResult result = orchestrator.executeBuild(runner);
     assertThat(getResource("sample:my sources/main/xoo/sample/My Sample.xoo")).isNotNull();
 
-    runner = configureRunnerIssues("batch/xoo-sample-with-spaces/v2");
+    runner = configureRunnerIssues("analysis/xoo-sample-with-spaces/v2");
     result = orchestrator.executeBuild(runner);
     // Analysis is not persisted in database
     Resource project = getResource("com.sonarsource.it.samples:simple-sample");
@@ -353,7 +354,7 @@ public class IssuesModeTest {
   }
 
   private void restoreProfile(String fileName) {
-    orchestrator.getServer().restoreProfile(FileLocation.ofClasspath("/batch/IssuesModeTest/" + fileName));
+    orchestrator.getServer().restoreProfile(FileLocation.ofClasspath("/analysis/IssuesModeTest/" + fileName));
   }
 
   private Resource getResource(String key) {
diff --git a/it/it-tests/src/test/java/batch/suite/LinksTest.java b/it/it-tests/src/test/java/it/analysis/LinksTest.java
index 3c670a53c82..897f64a343e 100644
--- a/it/it-tests/src/test/java/batch/suite/LinksTest.java
+++ b/it/it-tests/src/test/java/it/analysis/LinksTest.java
@@ -3,29 +3,29 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package batch.suite;
+package it.analysis;
 
-import util.ItUtils;
 import com.google.common.collect.Lists;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.MavenBuild;
 import com.sonar.orchestrator.build.SonarRunner;
 import com.sonar.orchestrator.db.Database;
+import it.Category3Suite;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import util.ItUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class LinksTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = BatchTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category3Suite.ORCHESTRATOR;
 
   private static String[] expectedLinks = new String[] {
     "homepage=http://www.simplesample.org_OVERRIDDEN",
@@ -47,7 +47,7 @@ public class LinksTest {
    */
   @Test
   public void shouldUseLinkProperties() {
-    SonarRunner runner = SonarRunner.create(ItUtils.projectDir("batch/links-project"))
+    SonarRunner runner = SonarRunner.create(ItUtils.projectDir("analysis/links-project"))
       .setProperty("sonar.scm.disabled", "true");
     orchestrator.executeBuild(runner);
 
@@ -59,7 +59,7 @@ public class LinksTest {
    */
   @Test
   public void shouldUseLinkPropertiesOverPomLinksInMaven() {
-    MavenBuild build = MavenBuild.create(ItUtils.projectPom("batch/links-project"))
+    MavenBuild build = MavenBuild.create(ItUtils.projectPom("analysis/links-project"))
       .setCleanPackageSonarGoals()
       .setProperty("sonar.scm.disabled", "true");
     orchestrator.executeBuild(build);
diff --git a/it/it-tests/src/test/java/batch/suite/MavenTest.java b/it/it-tests/src/test/java/it/analysis/MavenTest.java
index 3d3855b106b..8a924ee640d 100644
--- a/it/it-tests/src/test/java/batch/suite/MavenTest.java
+++ b/it/it-tests/src/test/java/it/analysis/MavenTest.java
@@ -3,17 +3,13 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package batch.suite;
+package it.analysis;
 
-import util.ItUtils;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.MavenBuild;
-
+import it.Category3Suite;
 import java.util.List;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Ignore;
@@ -21,11 +17,14 @@ import org.junit.Test;
 import org.sonar.wsclient.Sonar;
 import org.sonar.wsclient.services.Resource;
 import org.sonar.wsclient.services.ResourceQuery;
+import util.ItUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class MavenTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = BatchTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category3Suite.ORCHESTRATOR;
 
   @Before
   public void deleteData() {
diff --git a/it/it-tests/src/test/java/batch/suite/MultiLanguageTest.java b/it/it-tests/src/test/java/it/analysis/MultiLanguageTest.java
index ef5f394c79a..bf3b1ad0581 100644
--- a/it/it-tests/src/test/java/batch/suite/MultiLanguageTest.java
+++ b/it/it-tests/src/test/java/it/analysis/MultiLanguageTest.java
@@ -3,25 +3,26 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package batch.suite;
+package it.analysis;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
-import util.ItUtils;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.SonarRunner;
 import com.sonar.orchestrator.locator.FileLocation;
+import it.Category3Suite;
 import org.junit.After;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.sonar.wsclient.services.Resource;
 import org.sonar.wsclient.services.ResourceQuery;
+import util.ItUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class MultiLanguageTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = BatchTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category3Suite.ORCHESTRATOR;
 
   @After
   public void cleanDatabase() {
@@ -34,15 +35,15 @@ public class MultiLanguageTest {
    */
   @Test
   public void test_sonar_runner_inspection() {
-    orchestrator.getServer().restoreProfile(FileLocation.ofClasspath("/batch/MultiLanguageTest/one-issue-per-line.xml"));
-    orchestrator.getServer().restoreProfile(FileLocation.ofClasspath("/batch/MultiLanguageTest/one-issue-per-line-xoo2.xml"));
+    orchestrator.getServer().restoreProfile(FileLocation.ofClasspath("/analysis/MultiLanguageTest/one-issue-per-line.xml"));
+    orchestrator.getServer().restoreProfile(FileLocation.ofClasspath("/analysis/MultiLanguageTest/one-issue-per-line-xoo2.xml"));
 
     orchestrator.getServer().provisionProject("multi-language-sample", "multi-language-sample");
 
     orchestrator.getServer().associateProjectToQualityProfile("multi-language-sample", "xoo", "one-issue-per-line");
     orchestrator.getServer().associateProjectToQualityProfile("multi-language-sample","xoo2", "one-issue-per-line-xoo2");
 
-    SonarRunner build = SonarRunner.create().setProjectDir(ItUtils.projectDir("batch/xoo-multi-languages"));
+    SonarRunner build = SonarRunner.create().setProjectDir(ItUtils.projectDir("analysis/xoo-multi-languages"));
     BuildResult result = orchestrator.executeBuild(build);
 
     assertThat(result.getLogs()).contains("2 files indexed");
diff --git a/it/it-tests/src/test/java/batch/suite/ProjectBuilderTest.java b/it/it-tests/src/test/java/it/analysis/ProjectBuilderTest.java
index 9728fc0a3d2..c3a069eefc9 100644
--- a/it/it-tests/src/test/java/batch/suite/ProjectBuilderTest.java
+++ b/it/it-tests/src/test/java/it/analysis/ProjectBuilderTest.java
@@ -3,10 +3,11 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package batch.suite;
+package it.analysis;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.MavenBuild;
+import it.Category3Suite;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.sonar.wsclient.services.Resource;
@@ -26,11 +27,11 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class ProjectBuilderTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = BatchTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category3Suite.ORCHESTRATOR;
 
   @Test
   public void shouldDefineProjectFromPlugin() {
-    MavenBuild build = MavenBuild.create(ItUtils.projectPom("batch/project-builder"))
+    MavenBuild build = MavenBuild.create(ItUtils.projectPom("analysis/project-builder"))
       .setCleanSonarGoals()
       .setProperty("sonar.enableProjectBuilder", "true")
       .setProperty("sonar.dynamicAnalysis", "false");
diff --git a/it/it-tests/src/test/java/batch/suite/ProjectExclusionsTest.java b/it/it-tests/src/test/java/it/analysis/ProjectExclusionsTest.java
index cd9e83ae4fb..f5092905cca 100644
--- a/it/it-tests/src/test/java/batch/suite/ProjectExclusionsTest.java
+++ b/it/it-tests/src/test/java/it/analysis/ProjectExclusionsTest.java
@@ -3,23 +3,24 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package batch.suite;
-
-import util.ItUtils;
+package it.analysis;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.MavenBuild;
+import it.Category3Suite;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.sonar.wsclient.services.Resource;
 import org.sonar.wsclient.services.ResourceQuery;
+import util.ItUtils;
+
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
 public class ProjectExclusionsTest {
   @ClassRule
-  public static Orchestrator orchestrator = BatchTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category3Suite.ORCHESTRATOR;
 
   @Before
   public void deleteProjectData() {
diff --git a/it/it-tests/src/test/java/batch/suite/ProjectProvisioningTest.java b/it/it-tests/src/test/java/it/analysis/ProjectProvisioningTest.java
index b928e4939db..7e4bc7e700d 100644
--- a/it/it-tests/src/test/java/batch/suite/ProjectProvisioningTest.java
+++ b/it/it-tests/src/test/java/it/analysis/ProjectProvisioningTest.java
@@ -3,14 +3,12 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package batch.suite;
+package it.analysis;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
-import util.ItUtils;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.SonarRunner;
+import it.Category3Suite;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -20,12 +18,15 @@ import org.junit.Test;
 import org.sonar.wsclient.SonarClient;
 import org.sonar.wsclient.project.NewProject;
 import org.sonar.wsclient.services.PropertyUpdateQuery;
+import util.ItUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 @Ignore
 public class ProjectProvisioningTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = BatchTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category3Suite.ORCHESTRATOR;
 
   @BeforeClass
   public static void init() {
diff --git a/it/it-tests/src/test/java/batch/suite/SettingsEncryptionTest.java b/it/it-tests/src/test/java/it/analysis/SettingsEncryptionTest.java
index 9a900fee3eb..974694df9ee 100644
--- a/it/it-tests/src/test/java/batch/suite/SettingsEncryptionTest.java
+++ b/it/it-tests/src/test/java/it/analysis/SettingsEncryptionTest.java
@@ -3,12 +3,13 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package batch.suite;
+package it.analysis;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.BuildFailureException;
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.SonarRunner;
+import it.Category3Suite;
 import java.io.File;
 import java.net.URL;
 import org.junit.ClassRule;
@@ -18,8 +19,9 @@ import util.ItUtils;
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class SettingsEncryptionTest {
+
   @ClassRule
-  public static Orchestrator orchestrator = BatchTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category3Suite.ORCHESTRATOR;
 
   /**
    * SONAR-2084
@@ -61,7 +63,7 @@ public class SettingsEncryptionTest {
   }
 
   private String pathToValidSecretKey() throws Exception {
-    URL resource = getClass().getResource("/batch/SettingsEncryptionTest/sonar-secret.txt");
+    URL resource = getClass().getResource("/analysis/SettingsEncryptionTest/sonar-secret.txt");
     return new File(resource.toURI()).getCanonicalPath();
   }
 }
diff --git a/it/it-tests/src/test/java/batch/suite/TempFolderTest.java b/it/it-tests/src/test/java/it/analysis/TempFolderTest.java
index c422eb9d987..5535e84cd28 100644
--- a/it/it-tests/src/test/java/batch/suite/TempFolderTest.java
+++ b/it/it-tests/src/test/java/it/analysis/TempFolderTest.java
@@ -3,29 +3,28 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package batch.suite;
-
-import util.ItUtils;
+package it.analysis;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.SonarRunner;
 import com.sonar.orchestrator.locator.FileLocation;
+import it.Category3Suite;
+import java.io.File;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
-
-import java.io.File;
+import util.ItUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class TempFolderTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = BatchTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category3Suite.ORCHESTRATOR;
 
   @Rule
   public ExpectedException thrown = ExpectedException.none();
@@ -36,7 +35,7 @@ public class TempFolderTest {
   @Before
   public void deleteData() {
     orchestrator.resetData();
-    orchestrator.getServer().restoreProfile(FileLocation.ofClasspath("/batch/TempFolderTest/one-issue-per-line.xml"));
+    orchestrator.getServer().restoreProfile(FileLocation.ofClasspath("/analysis/TempFolderTest/one-issue-per-line.xml"));
     orchestrator.getServer().provisionProject("sample", "Sample");
     orchestrator.getServer().associateProjectToQualityProfile("sample", "xoo", "one-issue-per-line");
   }
diff --git a/it/it-tests/src/test/java/exclusions/suite/FileExclusionsTest.java b/it/it-tests/src/test/java/it/analysisExclusion/FileExclusionsTest.java
index 191adcab25d..f08425e16ad 100644
--- a/it/it-tests/src/test/java/exclusions/suite/FileExclusionsTest.java
+++ b/it/it-tests/src/test/java/it/analysisExclusion/FileExclusionsTest.java
@@ -3,19 +3,18 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package exclusions.suite;
-
-import util.ItUtils;
+package it.analysisExclusion;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
+import it.Category4Suite;
+import java.util.List;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.sonar.wsclient.services.Resource;
 import org.sonar.wsclient.services.ResourceQuery;
-
-import java.util.List;
+import util.ItUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -23,7 +22,7 @@ public class FileExclusionsTest {
   static final String PROJECT = "exclusions";
 
   @ClassRule
-  public static Orchestrator orchestrator = ExclusionsTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category4Suite.ORCHESTRATOR;
 
   @Before
   public void resetData() {
diff --git a/it/it-tests/src/test/java/exclusions/suite/IssueExclusionsTest.java b/it/it-tests/src/test/java/it/analysisExclusion/IssueExclusionsTest.java
index 12bbfa23707..0cff840be27 100644
--- a/it/it-tests/src/test/java/exclusions/suite/IssueExclusionsTest.java
+++ b/it/it-tests/src/test/java/it/analysisExclusion/IssueExclusionsTest.java
@@ -3,21 +3,22 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package exclusions.suite;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import util.ItUtils;
+package it.analysisExclusion;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.SonarRunner;
 import com.sonar.orchestrator.locator.FileLocation;
+import it.Category3Suite;
+import it.Category4Suite;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.sonar.wsclient.services.Resource;
 import org.sonar.wsclient.services.ResourceQuery;
+import util.ItUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class IssueExclusionsTest {
 
@@ -25,7 +26,7 @@ public class IssueExclusionsTest {
   private static final String PROJECT_DIR = "exclusions/xoo-multi-modules";
 
   @ClassRule
-  public static Orchestrator orchestrator = ExclusionsTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category4Suite.ORCHESTRATOR;
 
   @Before
   public void resetData() {
diff --git a/it/it-tests/src/test/java/it/componentSearch/ProjectSearchTest.java b/it/it-tests/src/test/java/it/componentSearch/ProjectSearchTest.java
new file mode 100644
index 00000000000..e13068469af
--- /dev/null
+++ b/it/it-tests/src/test/java/it/componentSearch/ProjectSearchTest.java
@@ -0,0 +1,75 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package it.componentSearch;
+
+import com.sonar.orchestrator.Orchestrator;
+import com.sonar.orchestrator.build.SonarRunner;
+import it.Category4Suite;
+import java.io.IOException;
+import org.apache.commons.io.IOUtils;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.util.EntityUtils;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static util.ItUtils.projectDir;
+
+public class ProjectSearchTest {
+
+  @ClassRule
+  public static final Orchestrator orchestrator = Category4Suite.ORCHESTRATOR;
+
+  @Before
+  public void inspectProject() {
+    orchestrator.resetData();
+    orchestrator.executeBuild(SonarRunner.create(projectDir("shared/xoo-sample")));
+  }
+
+  /**
+   * SONAR-3105
+   */
+  @Test
+  public void projects_web_service() throws IOException {
+    SonarRunner build = SonarRunner.create(projectDir("shared/xoo-sample"));
+    orchestrator.executeBuild(build);
+
+    String url = orchestrator.getServer().getUrl() + "/api/projects?key=sample&versions=true";
+    HttpClient httpclient = new DefaultHttpClient();
+    try {
+      HttpGet get = new HttpGet(url);
+      HttpResponse response = httpclient.execute(get);
+
+      assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
+      String content = IOUtils.toString(response.getEntity().getContent());
+      assertThat(content).doesNotContain("error");
+      assertThat(content).contains("sample");
+      EntityUtils.consume(response.getEntity());
+
+    } finally {
+      httpclient.getConnectionManager().shutdown();
+    }
+  }
+}
diff --git a/it/it-tests/src/test/java/analysis/suite/measure/CustomMeasuresTest.java b/it/it-tests/src/test/java/it/customMeasure/CustomMeasuresTest.java
index 32fdc51c8b9..c7b4af337c8 100644
--- a/it/it-tests/src/test/java/analysis/suite/measure/CustomMeasuresTest.java
+++ b/it/it-tests/src/test/java/it/customMeasure/CustomMeasuresTest.java
@@ -17,11 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package analysis.suite.measure;
+package it.customMeasure;
 
-import analysis.suite.AnalysisTestSuite;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
+import it.Category2Suite;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.junit.Before;
@@ -38,7 +38,7 @@ public class CustomMeasuresTest {
 
   public static final String PROJECT_KEY = "sample";
   @ClassRule
-  public static Orchestrator orchestrator = AnalysisTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category2Suite.ORCHESTRATOR;
 
   @Before
   public void deleteProjects() {
diff --git a/it/it-tests/src/test/java/duplications/suite/CrossProjectDuplicationsTest.java b/it/it-tests/src/test/java/it/duplication/CrossProjectDuplicationsTest.java
index b4505ab1359..e94289ba848 100644
--- a/it/it-tests/src/test/java/duplications/suite/CrossProjectDuplicationsTest.java
+++ b/it/it-tests/src/test/java/it/duplication/CrossProjectDuplicationsTest.java
@@ -3,18 +3,20 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package duplications.suite;
-
-import util.ItUtils;
+package it.duplication;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.MavenBuild;
+import it.Category3Suite;
+import it.Category4Suite;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.sonar.wsclient.services.Resource;
 import org.sonar.wsclient.services.ResourceQuery;
+import util.ItUtils;
+
 import static org.hamcrest.Matchers.notNullValue;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
@@ -23,7 +25,7 @@ import static org.junit.Assert.assertThat;
 public class CrossProjectDuplicationsTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = DuplicationsTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category4Suite.ORCHESTRATOR;
 
   @Before
   public void analyzeProjects() {
diff --git a/it/it-tests/src/test/java/duplications/suite/DuplicationsTest.java b/it/it-tests/src/test/java/it/duplication/DuplicationsTest.java
index 9f71da26a03..7880a4e6b95 100644
--- a/it/it-tests/src/test/java/duplications/suite/DuplicationsTest.java
+++ b/it/it-tests/src/test/java/it/duplication/DuplicationsTest.java
@@ -3,17 +3,19 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package duplications.suite;
-
-import util.ItUtils;
+package it.duplication;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.MavenBuild;
+import it.Category3Suite;
+import it.Category4Suite;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.sonar.wsclient.services.Resource;
 import org.sonar.wsclient.services.ResourceQuery;
+import util.ItUtils;
+
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.core.IsNot.not;
 import static org.hamcrest.core.IsNull.nullValue;
@@ -23,8 +25,9 @@ public class DuplicationsTest {
 
   private static final String DUPLICATIONS = "com.sonarsource.it.samples:duplications";
   private static final String DUPLICATIONS_WITH_EXCLUSIONS = "com.sonarsource.it.samples:duplications-with-exclusions";
+
   @ClassRule
-  public static Orchestrator orchestrator = DuplicationsTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category4Suite.ORCHESTRATOR;
 
   @BeforeClass
   public static void init() {
diff --git a/it/it-tests/src/test/java/administration/suite/ui/I18nTest.java b/it/it-tests/src/test/java/it/i18n/I18nTest.java
index ceaae083974..a75f17aa4a0 100644
--- a/it/it-tests/src/test/java/administration/suite/ui/I18nTest.java
+++ b/it/it-tests/src/test/java/it/i18n/I18nTest.java
@@ -18,12 +18,12 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package administration.suite.ui;
+package it.i18n;
 
-import administration.suite.AdministrationTestSuite;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
 import com.sonar.orchestrator.selenium.Selenese;
+import it.Category1Suite;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -34,7 +34,7 @@ import static util.ItUtils.projectDir;
 public class I18nTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = AdministrationTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category1Suite.ORCHESTRATOR;
 
   @Before
   public void cleanDatabase() {
@@ -49,11 +49,11 @@ public class I18nTest {
     orchestrator.executeBuild(SonarRunner.create(projectDir("shared/xoo-sample")));
 
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("ui-i18n",
-      "/ui/i18n/default-locale-is-english.html",
-      "/ui/i18n/french-locale.html",
-      "/ui/i18n/french-pack.html",
-      "/ui/i18n/locale-with-france-country.html",
-      "/ui/i18n/locale-with-swiss-country.html").build();
+      "/i18n/default-locale-is-english.html",
+      "/i18n/french-locale.html",
+      "/i18n/french-pack.html",
+      "/i18n/locale-with-france-country.html",
+      "/i18n/locale-with-swiss-country.html").build();
     new SeleneseTest(selenese).runOn(orchestrator);
   }
 
diff --git a/it/it-tests/src/test/java/issue/suite/IssueTestSuite.java b/it/it-tests/src/test/java/it/issue/AbstractIssueTest.java
index 3d0dd4b1875..565fea9f987 100644
--- a/it/it-tests/src/test/java/issue/suite/IssueTestSuite.java
+++ b/it/it-tests/src/test/java/it/issue/AbstractIssueTest.java
@@ -1,44 +1,40 @@
 /*
- * Copyright (C) 2009-2014 SonarSource SA
- * All rights reserved
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
  * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package issue.suite;
+
+package it.issue;
 
 import com.sonar.orchestrator.Orchestrator;
+import it.Category2Suite;
 import java.util.List;
 import org.junit.ClassRule;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
 import org.sonar.wsclient.issue.Issue;
 import org.sonar.wsclient.issue.IssueClient;
 import org.sonar.wsclient.issue.IssueQuery;
 import org.sonar.wsclient.issue.Issues;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static util.ItUtils.pluginArtifact;
-import static util.ItUtils.xooPlugin;
 
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-  CommonRulesTest.class,
-  IssueWorkflowTest.class,
-  ManualRulesTest.class,
-  CustomRulesTest.class,
-  IssueActionTest.class,
-  IssueChangelogTest.class,
-  IssueBulkChangeTest.class,
-  IssuePurgeTest.class,
-  IssueFilterExtensionTest.class
-})
-public class IssueTestSuite {
+public abstract class AbstractIssueTest {
 
   @ClassRule
-  public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
-    .addPlugin(xooPlugin())
-    .addPlugin(pluginArtifact("issue-action-plugin"))
-    .addPlugin(pluginArtifact("issue-filter-plugin"))
-    .build();
+  public static final Orchestrator ORCHESTRATOR = Category2Suite.ORCHESTRATOR;
 
   static IssueClient adminIssueClient() {
     return ORCHESTRATOR.getServer().adminWsClient().issueClient();
diff --git a/it/it-tests/src/test/java/issue/suite/CommonRulesTest.java b/it/it-tests/src/test/java/it/issue/CommonRulesTest.java
index ba6d871245d..074f32e2e85 100644
--- a/it/it-tests/src/test/java/issue/suite/CommonRulesTest.java
+++ b/it/it-tests/src/test/java/it/issue/CommonRulesTest.java
@@ -17,38 +17,32 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package issue.suite;
+package it.issue;
 
-import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.locator.FileLocation;
 import java.util.List;
 import org.junit.BeforeClass;
-import org.junit.ClassRule;
 import org.junit.Test;
 import org.sonar.wsclient.issue.Issue;
 import org.sonar.wsclient.issue.IssueQuery;
 
-import static issue.suite.IssueTestSuite.searchIssues;
 import static org.assertj.core.api.Assertions.assertThat;
 import static util.ItUtils.runProjectAnalysis;
 
-public class CommonRulesTest {
+public class CommonRulesTest extends AbstractIssueTest {
 
   public static final String FILE_KEY = "common-rules-project:src/Sample.xoo";
   public static final String TEST_FILE_KEY = "common-rules-project:test/SampleTest.xoo";
 
-  @ClassRule
-  public static Orchestrator orchestrator = IssueTestSuite.ORCHESTRATOR;
-
   @BeforeClass
   public static void setUp() {
-    orchestrator.resetData();
-    orchestrator.getServer().restoreProfile(FileLocation.ofClasspath("/issue/suite/CommonRulesTest/xoo-common-rules-profile.xml"));
-    orchestrator.getServer().provisionProject("common-rules-project", "Sample");
-    orchestrator.getServer().associateProjectToQualityProfile("common-rules-project", "xoo", "xoo-common-rules");
-    runProjectAnalysis(orchestrator, "issue/common-rules",
-        "sonar.cpd.xoo.minimumTokens", "2",
-        "sonar.cpd.xoo.minimumLines", "2");
+    ORCHESTRATOR.resetData();
+    ORCHESTRATOR.getServer().restoreProfile(FileLocation.ofClasspath("/issue/CommonRulesTest/xoo-common-rules-profile.xml"));
+    ORCHESTRATOR.getServer().provisionProject("common-rules-project", "Sample");
+    ORCHESTRATOR.getServer().associateProjectToQualityProfile("common-rules-project", "xoo", "xoo-common-rules");
+    runProjectAnalysis(ORCHESTRATOR, "issue/common-rules",
+      "sonar.cpd.xoo.minimumTokens", "2",
+      "sonar.cpd.xoo.minimumLines", "2");
   }
 
   @Test
diff --git a/it/it-tests/src/test/java/issue/suite/CustomRulesTest.java b/it/it-tests/src/test/java/it/issue/CustomRulesTest.java
index 66671a40912..230c669c84d 100644
--- a/it/it-tests/src/test/java/issue/suite/CustomRulesTest.java
+++ b/it/it-tests/src/test/java/it/issue/CustomRulesTest.java
@@ -17,33 +17,28 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package issue.suite;
+package it.issue;
 
-import com.sonar.orchestrator.Orchestrator;
 import java.util.List;
 import org.junit.Before;
-import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.sonar.wsclient.issue.Issue;
 import util.ProjectAnalysis;
 import util.ProjectAnalysisRule;
 
-import static issue.suite.IssueTestSuite.searchIssues;
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class CustomRulesTest {
+public class CustomRulesTest extends AbstractIssueTest {
 
-  @ClassRule
-  public static Orchestrator orchestrator = IssueTestSuite.ORCHESTRATOR;
   @Rule
-  public final ProjectAnalysisRule projectAnalysisRule = ProjectAnalysisRule.from(orchestrator);
+  public final ProjectAnalysisRule projectAnalysisRule = ProjectAnalysisRule.from(ORCHESTRATOR);
 
   private ProjectAnalysis xooSampleAnalysis;
 
   @Before
   public void setup() {
-    String profileKey = projectAnalysisRule.registerProfile("/issue/suite/CustomRulesTest/custom.xml");
+    String profileKey = projectAnalysisRule.registerProfile("/issue/CustomRulesTest/custom.xml");
     String projectKey = projectAnalysisRule.registerProject("shared/xoo-sample");
     this.xooSampleAnalysis = projectAnalysisRule.newProjectAnalysis(projectKey)
       .withQualityProfile(profileKey);
@@ -51,7 +46,7 @@ public class CustomRulesTest {
 
   @Test
   public void analyzeProjectWithCustomRules() throws Exception {
-    orchestrator.getServer().adminWsClient().post("api/rules/create",
+    ORCHESTRATOR.getServer().adminWsClient().post("api/rules/create",
       "template_key", "xoo:TemplateRule",
       "custom_key", "MyCustomRule",
       "markdown_description", "My description",
diff --git a/it/it-tests/src/test/java/issue/suite/IssueActionTest.java b/it/it-tests/src/test/java/it/issue/IssueActionTest.java
index cb0de90b12c..8bc321c236a 100644
--- a/it/it-tests/src/test/java/issue/suite/IssueActionTest.java
+++ b/it/it-tests/src/test/java/it/issue/IssueActionTest.java
@@ -17,12 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package issue.suite;
+package it.issue;
 
-import com.sonar.orchestrator.Orchestrator;
 import java.util.List;
+import org.assertj.core.api.Assertions;
 import org.junit.Before;
-import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.sonar.wsclient.base.HttpException;
@@ -36,30 +35,22 @@ import org.sonar.wsclient.issue.NewActionPlan;
 import util.ProjectAnalysis;
 import util.ProjectAnalysisRule;
 
-import static issue.suite.IssueTestSuite.ORCHESTRATOR;
-import static issue.suite.IssueTestSuite.adminIssueClient;
-import static issue.suite.IssueTestSuite.search;
-import static issue.suite.IssueTestSuite.searchIssueByKey;
-import static issue.suite.IssueTestSuite.searchIssues;
-import static issue.suite.IssueTestSuite.searchRandomIssue;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
 import static util.ItUtils.toDate;
 import static util.ItUtils.verifyHttpException;
 
-public class IssueActionTest {
+public class IssueActionTest extends AbstractIssueTest {
 
-  @ClassRule
-  public static Orchestrator orchestrator = ORCHESTRATOR;
   @Rule
-  public final ProjectAnalysisRule projectAnalysisRule = ProjectAnalysisRule.from(orchestrator);
+  public final ProjectAnalysisRule projectAnalysisRule = ProjectAnalysisRule.from(ORCHESTRATOR);
 
   Issue issue;
   ProjectAnalysis projectAnalysis;
 
   @Before
   public void setup() {
-    String qualityProfileKey = projectAnalysisRule.registerProfile("/issue/suite/IssueActionTest/xoo-one-issue-per-line-profile.xml");
+    String qualityProfileKey = projectAnalysisRule.registerProfile("/issue/IssueActionTest/xoo-one-issue-per-line-profile.xml");
     String projectKey = projectAnalysisRule.registerProject("shared/xoo-sample");
 
     this.projectAnalysis = projectAnalysisRule.newProjectAnalysis(projectKey).withQualityProfile(qualityProfileKey);
@@ -139,7 +130,7 @@ public class IssueActionTest {
     assertThat(issues.users()).isEmpty();
 
     adminIssueClient().assign(issue.key(), "admin");
-    assertThat(searchIssues(IssueQuery.create().assignees("admin"))).hasSize(1);
+    Assertions.assertThat(searchIssues(IssueQuery.create().assignees("admin"))).hasSize(1);
 
     projectAnalysis.run();
     Issue reloaded = searchIssueByKey(issue.key());
@@ -154,7 +145,7 @@ public class IssueActionTest {
     adminIssueClient().assign(issue.key(), null);
     reloaded = searchIssueByKey(issue.key());
     assertThat(reloaded.assignee()).isNull();
-    assertThat(searchIssues(IssueQuery.create().assignees("admin"))).isEmpty();
+    Assertions.assertThat(searchIssues(IssueQuery.create().assignees("admin"))).isEmpty();
   }
 
   /**
@@ -183,7 +174,7 @@ public class IssueActionTest {
       .description("Short term issues").deadLine(toDate("2113-01-31")));
     assertThat(newActionPlan.key()).isNotNull();
     adminIssueClient().plan(issue.key(), newActionPlan.key());
-    assertThat(search(IssueQuery.create().actionPlans(newActionPlan.key())).list()).hasSize(1);
+    Assertions.assertThat(search(IssueQuery.create().actionPlans(newActionPlan.key())).list()).hasSize(1);
 
     projectAnalysis.run();
     Issue reloaded = searchIssueByKey(issue.key());
@@ -214,11 +205,11 @@ public class IssueActionTest {
       .description("Short term issues").deadLine(toDate("2113-01-31")));
     assertThat(newActionPlan.key()).isNotNull();
     adminIssueClient().plan(issue.key(), newActionPlan.key());
-    assertThat(search(IssueQuery.create().actionPlans(newActionPlan.key())).list()).hasSize(1);
+    Assertions.assertThat(search(IssueQuery.create().actionPlans(newActionPlan.key())).list()).hasSize(1);
 
     // Unplan
     adminIssueClient().plan(issue.key(), null);
-    assertThat(search(IssueQuery.create().actionPlans(newActionPlan.key())).list()).hasSize(0);
+    Assertions.assertThat(search(IssueQuery.create().actionPlans(newActionPlan.key())).list()).hasSize(0);
 
     projectAnalysis.run();
     Issue reloaded = searchIssueByKey(issue.key());
@@ -233,7 +224,7 @@ public class IssueActionTest {
   public void apply_action_from_plugin() {
     // The condition on the action defined by the plugin is that the status must be resolved
     adminIssueClient().doTransition(issue.key(), "resolve");
-    assertThat(adminIssueClient().actions(issue.key())).contains("fake");
+    Assertions.assertThat(adminIssueClient().actions(issue.key())).contains("fake");
 
     adminIssueClient().doAction(issue.key(), "fake");
 
@@ -244,7 +235,7 @@ public class IssueActionTest {
     assertThat(reloaded.comments().get(0).htmlText()).isEqualTo("New Comment from fake action");
 
     // The action is no more available when already executed (because an issue attribute is used to check if the action is available or not)
-    assertThat(adminIssueClient().actions(issue.key())).doesNotContain("fake");
+    Assertions.assertThat(adminIssueClient().actions(issue.key())).doesNotContain("fake");
   }
 
   /**
@@ -255,12 +246,12 @@ public class IssueActionTest {
     // The condition on the action defined by the plugin is that the status must be resolved
     adminIssueClient().doTransition(issue.key(), "resolve");
     adminIssueClient().doAction(issue.key(), "fake");
-    assertThat(adminIssueClient().actions(issue.key())).doesNotContain("fake");
+    Assertions.assertThat(adminIssueClient().actions(issue.key())).doesNotContain("fake");
 
     projectAnalysis.run();
 
     // Fake action is no more available if the issue attribute is still there
-    assertThat(adminIssueClient().actions(issue.key())).doesNotContain("fake");
+    Assertions.assertThat(adminIssueClient().actions(issue.key())).doesNotContain("fake");
   }
 
   private static List<Issue> searchIssuesBySeverities(String componentKey, String... severities) {
@@ -268,7 +259,7 @@ public class IssueActionTest {
   }
 
   private static ActionPlanClient adminActionPlanClient() {
-    return orchestrator.getServer().adminWsClient().actionPlanClient();
+    return ORCHESTRATOR.getServer().adminWsClient().actionPlanClient();
   }
 
 }
diff --git a/it/it-tests/src/test/java/issue/suite/IssueBulkChangeTest.java b/it/it-tests/src/test/java/it/issue/IssueBulkChangeTest.java
index f5b438a7ef4..a67684c4856 100644
--- a/it/it-tests/src/test/java/issue/suite/IssueBulkChangeTest.java
+++ b/it/it-tests/src/test/java/it/issue/IssueBulkChangeTest.java
@@ -17,14 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package issue.suite;
+package it.issue;
 
 import com.google.common.base.Function;
 import com.google.common.collect.FluentIterable;
-import com.sonar.orchestrator.Orchestrator;
 import java.util.List;
 import org.junit.Before;
-import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.sonar.wsclient.base.HttpException;
@@ -38,30 +36,25 @@ import util.ItUtils;
 import util.ProjectAnalysis;
 import util.ProjectAnalysisRule;
 
-import static issue.suite.IssueTestSuite.ORCHESTRATOR;
-import static issue.suite.IssueTestSuite.adminIssueClient;
-import static issue.suite.IssueTestSuite.issueClient;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * SONAR-4421
  */
-public class IssueBulkChangeTest {
+public class IssueBulkChangeTest extends AbstractIssueTest {
 
   private static final int BULK_EDITED_ISSUE_COUNT = 3;
   private static final String COMMENT_AS_MARKDOWN = "this is my *comment*";
   private static final String COMMENT_AS_HTML = "this is my <em>comment</em>";
 
-  @ClassRule
-  public static Orchestrator orchestrator = ORCHESTRATOR;
   @Rule
-  public final ProjectAnalysisRule projectAnalysisRule = ProjectAnalysisRule.from(orchestrator);
+  public final ProjectAnalysisRule projectAnalysisRule = ProjectAnalysisRule.from(ORCHESTRATOR);
 
   private ProjectAnalysis xooSampleLittleIssuesAnalysis;
 
   @Before
   public void setUp() throws Exception {
-    String qualityProfileKey = projectAnalysisRule.registerProfile("/issue/suite/IssueBulkChangeTest/one-issue-per-line-profile.xml");
+    String qualityProfileKey = projectAnalysisRule.registerProfile("/issue/IssueBulkChangeTest/one-issue-per-line-profile.xml");
     String projectKey = projectAnalysisRule.registerProject("shared/xoo-sample");
     this.xooSampleLittleIssuesAnalysis = projectAnalysisRule.newProjectAnalysis(projectKey)
       .withQualityProfile(qualityProfileKey);
@@ -97,7 +90,7 @@ public class IssueBulkChangeTest {
     BulkChange bulkChange = buldChangeAssigneeOfIssues(issueKeys, "admin");
 
     assertThat(bulkChange.totalIssuesChanged()).isEqualTo(BULK_EDITED_ISSUE_COUNT);
-    for (Issue issue : IssueTestSuite.searchIssues(issueKeys)) {
+    for (Issue issue : searchIssues(issueKeys)) {
       assertThat(issue.assignee()).isEqualTo("admin");
     }
   }
@@ -119,7 +112,7 @@ public class IssueBulkChangeTest {
       );
 
     assertThat(bulkChange.totalIssuesChanged()).isEqualTo(BULK_EDITED_ISSUE_COUNT);
-    for (Issue issue : IssueTestSuite.searchIssues(issueKeys)) {
+    for (Issue issue : searchIssues(issueKeys)) {
       assertThat(issue.actionPlan()).isEqualTo(newActionPlan.key());
     }
   }
@@ -140,7 +133,7 @@ public class IssueBulkChangeTest {
       );
 
     assertThat(bulkChange.totalIssuesChanged()).isEqualTo(BULK_EDITED_ISSUE_COUNT);
-    for (Issue issue : IssueTestSuite.searchIssues(issueKeys, true)) {
+    for (Issue issue : searchIssues(issueKeys, true)) {
       assertThat(issue.comments()).hasSize(1);
       assertThat(issue.comments().get(0).htmlText()).isEqualTo(COMMENT_AS_HTML);
     }
@@ -164,7 +157,7 @@ public class IssueBulkChangeTest {
       );
 
     assertThat(bulkChange.totalIssuesChanged()).isEqualTo(BULK_EDITED_ISSUE_COUNT);
-    for (Issue issue : IssueTestSuite.searchIssues(issueKeys, true)) {
+    for (Issue issue : searchIssues(issueKeys, true)) {
       assertThat(issue.status()).isEqualTo("CONFIRMED");
       assertThat(issue.assignee()).isEqualTo("admin");
       assertThat(issue.severity()).isEqualTo(newSeverity);
@@ -235,7 +228,7 @@ public class IssueBulkChangeTest {
     String[] issueKeys = searchIssueKeys(nbIssues);
 
     // Confirm an issue
-    adminIssueClient().doTransition(IssueTestSuite.searchIssues().iterator().next().key(), "confirm");
+    adminIssueClient().doTransition(searchIssues().iterator().next().key(), "confirm");
 
     // Apply a bulk change on unconfirm transition
     BulkChangeQuery query = (BulkChangeQuery.create()
@@ -248,7 +241,7 @@ public class IssueBulkChangeTest {
     assertThat(bulkChange.totalIssuesChanged()).isEqualTo(1);
 
     int nbIssuesWithComment = 0;
-    for (Issue issue : IssueTestSuite.searchIssues(issueKeys, true)) {
+    for (Issue issue : searchIssues(issueKeys, true)) {
       if (!issue.comments().isEmpty()) {
         nbIssuesWithComment++;
       }
@@ -258,13 +251,13 @@ public class IssueBulkChangeTest {
   }
 
   private static void assertIssueSeverity(String[] issueKeys, String expectedSeverity) {
-    for (Issue issue : IssueTestSuite.searchIssues(issueKeys)) {
+    for (Issue issue : searchIssues(issueKeys)) {
       assertThat(issue.severity()).isEqualTo(expectedSeverity);
     }
   }
 
   private static void assertIssueStatus(String[] issueKeys, String expectedStatus) {
-    for (Issue issue : IssueTestSuite.searchIssues(issueKeys)) {
+    for (Issue issue : searchIssues(issueKeys)) {
       assertThat(issue.status()).isEqualTo(expectedStatus);
     }
   }
@@ -316,11 +309,11 @@ public class IssueBulkChangeTest {
   }
 
   private static String[] searchIssueKeys(int limit) {
-    return getIssueKeys(IssueTestSuite.searchIssues(), limit);
+    return getIssueKeys(searchIssues(), limit);
   }
 
   private static ActionPlanClient adminActionPlanClient() {
-    return orchestrator.getServer().adminWsClient().actionPlanClient();
+    return ORCHESTRATOR.getServer().adminWsClient().actionPlanClient();
   }
 
   private enum IssueToKey implements Function<Issue, String> {
diff --git a/it/it-tests/src/test/java/issue/suite/IssueChangelogTest.java b/it/it-tests/src/test/java/it/issue/IssueChangelogTest.java
index e141e2af2bf..5d3b0f8f4db 100644
--- a/it/it-tests/src/test/java/issue/suite/IssueChangelogTest.java
+++ b/it/it-tests/src/test/java/it/issue/IssueChangelogTest.java
@@ -17,32 +17,24 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package issue.suite;
+package it.issue;
 
-import com.sonar.orchestrator.Orchestrator;
 import java.util.List;
 import org.junit.Before;
-import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.sonar.wsclient.issue.Issue;
 import org.sonar.wsclient.issue.IssueChange;
 import org.sonar.wsclient.issue.IssueChangeDiff;
-import org.sonar.wsclient.issue.IssueQuery;
 import util.ProjectAnalysis;
 import util.ProjectAnalysisRule;
 
-import static issue.suite.IssueTestSuite.ORCHESTRATOR;
-import static issue.suite.IssueTestSuite.adminIssueClient;
-import static issue.suite.IssueTestSuite.issueClient;
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class IssueChangelogTest {
+public class IssueChangelogTest extends AbstractIssueTest {
 
-  @ClassRule
-  public static Orchestrator orchestrator = ORCHESTRATOR;
   @Rule
-  public final ProjectAnalysisRule projectAnalysisRule = ProjectAnalysisRule.from(orchestrator);
+  public final ProjectAnalysisRule projectAnalysisRule = ProjectAnalysisRule.from(ORCHESTRATOR);
 
   Issue issue;
   ProjectAnalysis xooSampleAnalysis;
@@ -51,7 +43,7 @@ public class IssueChangelogTest {
   public void resetData() {
     xooSampleAnalysis = projectAnalysisRule
       .newProjectAnalysis(projectAnalysisRule.registerProject("shared/xoo-sample"))
-      .withQualityProfile(projectAnalysisRule.registerProfile("/issue/suite/IssueChangelogTest/one-issue-per-line-profile.xml"));
+      .withQualityProfile(projectAnalysisRule.registerProfile("/issue/IssueChangelogTest/one-issue-per-line-profile.xml"));
     xooSampleAnalysis.run();
     issue = searchRandomIssue();
   }
@@ -118,12 +110,6 @@ public class IssueChangelogTest {
     assertThat(changeDiff2.newValue()).isEqualTo("REOPENED");
   }
 
-  private static Issue searchRandomIssue() {
-    List<Issue> issues = issueClient().find(IssueQuery.create()).list();
-    assertThat(issues).isNotEmpty();
-    return issues.get(0);
-  }
-
   private void assertIssueHasNoChange(String issueKey) {
     assertThat(retrieveChangeForIssue(issueKey)).isEmpty();
   }
diff --git a/it/it-tests/src/test/java/issue/suite/IssueFilterExtensionTest.java b/it/it-tests/src/test/java/it/issue/IssueFilterExtensionTest.java
index 3e00bdfb682..97dc11fee10 100644
--- a/it/it-tests/src/test/java/issue/suite/IssueFilterExtensionTest.java
+++ b/it/it-tests/src/test/java/it/issue/IssueFilterExtensionTest.java
@@ -17,11 +17,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package issue.suite;
+package it.issue;
 
-import com.sonar.orchestrator.Orchestrator;
 import java.util.List;
-import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.sonar.wsclient.issue.Issue;
@@ -32,21 +30,17 @@ import org.sonar.wsclient.services.ResourceQuery;
 import util.ProjectAnalysis;
 import util.ProjectAnalysisRule;
 
-import static issue.suite.IssueTestSuite.ORCHESTRATOR;
-import static issue.suite.IssueTestSuite.searchIssues;
 import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * Tests the extension point IssueFilter
  */
-public class IssueFilterExtensionTest {
+public class IssueFilterExtensionTest extends AbstractIssueTest {
 
-  @ClassRule
-  public static Orchestrator orchestrator = ORCHESTRATOR;
   @Rule
-  public final ProjectAnalysisRule projectAnalysisRule = ProjectAnalysisRule.from(orchestrator);
+  public final ProjectAnalysisRule projectAnalysisRule = ProjectAnalysisRule.from(ORCHESTRATOR);
 
-  private final String manyRuleProfileKey = projectAnalysisRule.registerProfile("/issue/suite/IssueFilterExtensionTest/xoo-with-many-rules.xml");
+  private final String manyRuleProfileKey = projectAnalysisRule.registerProfile("/issue/IssueFilterExtensionTest/xoo-with-many-rules.xml");
   private final String xooMultiModuleProjectKey = projectAnalysisRule.registerProject("shared/xoo-multi-modules-sample");
   private final ProjectAnalysis analysis = projectAnalysisRule.newProjectAnalysis(xooMultiModuleProjectKey)
     .withQualityProfile(manyRuleProfileKey);
@@ -101,7 +95,7 @@ public class IssueFilterExtensionTest {
   }
 
   private static Measure getMeasure(String projectKey, String metricKey) {
-    Resource resource = orchestrator.getServer().getWsClient().find(ResourceQuery.createForMetrics(projectKey, metricKey));
+    Resource resource = ORCHESTRATOR.getServer().getWsClient().find(ResourceQuery.createForMetrics(projectKey, metricKey));
     return resource == null ? null : resource.getMeasure(metricKey);
   }
 
diff --git a/it/it-tests/src/test/java/issue/suite/IssuePurgeTest.java b/it/it-tests/src/test/java/it/issue/IssuePurgeTest.java
index 7dfb307d3fc..44668fe25b6 100644
--- a/it/it-tests/src/test/java/issue/suite/IssuePurgeTest.java
+++ b/it/it-tests/src/test/java/it/issue/IssuePurgeTest.java
@@ -17,12 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package issue.suite;
+package it.issue;
 
-import com.sonar.orchestrator.Orchestrator;
 import java.util.List;
+import org.assertj.core.api.Assertions;
 import org.junit.Before;
-import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.sonar.wsclient.issue.Issue;
@@ -30,23 +29,19 @@ import org.sonar.wsclient.issue.IssueQuery;
 import util.ProjectAnalysis;
 import util.ProjectAnalysisRule;
 
-import static issue.suite.IssueTestSuite.ORCHESTRATOR;
-import static issue.suite.IssueTestSuite.searchIssues;
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class IssuePurgeTest {
+public class IssuePurgeTest extends AbstractIssueTest {
 
-  @ClassRule
-  public static Orchestrator orchestrator = ORCHESTRATOR;
   @Rule
-  public final ProjectAnalysisRule projectAnalysisRule = ProjectAnalysisRule.from(orchestrator);
+  public final ProjectAnalysisRule projectAnalysisRule = ProjectAnalysisRule.from(ORCHESTRATOR);
 
   private ProjectAnalysis xooSampleAnalysis;
   private ProjectAnalysis xooMultiModuleAnalysis;
 
   @Before
   public void setUp() throws Exception {
-    String manyRulesProfile = projectAnalysisRule.registerProfile("/issue/suite/IssuePurgeTest/with-many-rules.xml");
+    String manyRulesProfile = projectAnalysisRule.registerProfile("/issue/IssuePurgeTest/with-many-rules.xml");
     String xooSampleProjectKey = projectAnalysisRule.registerProject("shared/xoo-sample");
     this.xooSampleAnalysis = projectAnalysisRule.newProjectAnalysis(xooSampleProjectKey)
       .withQualityProfile(manyRulesProfile);
@@ -97,7 +92,7 @@ public class IssuePurgeTest {
         "sonar.dynamicAnalysis", "false",
         "sonar.projectDate", "2014-10-20")
       .run();
-    assertThat(searchIssues(IssueQuery.create())).isEmpty();
+    Assertions.assertThat(searchIssues(IssueQuery.create())).isEmpty();
   }
 
   /**
diff --git a/it/it-tests/src/test/java/issue/suite/IssueWorkflowTest.java b/it/it-tests/src/test/java/it/issue/IssueWorkflowTest.java
index 2e0f567c35b..c7d13376b9f 100644
--- a/it/it-tests/src/test/java/issue/suite/IssueWorkflowTest.java
+++ b/it/it-tests/src/test/java/it/issue/IssueWorkflowTest.java
@@ -17,12 +17,10 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package issue.suite;
+package it.issue;
 
-import com.sonar.orchestrator.Orchestrator;
 import java.util.List;
 import org.junit.Before;
-import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.sonar.wsclient.issue.Issue;
@@ -30,19 +28,12 @@ import org.sonar.wsclient.issue.IssueQuery;
 import util.ProjectAnalysis;
 import util.ProjectAnalysisRule;
 
-import static issue.suite.IssueTestSuite.adminIssueClient;
-import static issue.suite.IssueTestSuite.searchIssueByKey;
-import static issue.suite.IssueTestSuite.searchIssues;
-import static issue.suite.IssueTestSuite.searchRandomIssue;
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class IssueWorkflowTest {
-
-  @ClassRule
-  public static Orchestrator orchestrator = IssueTestSuite.ORCHESTRATOR;
+public class IssueWorkflowTest extends AbstractIssueTest {
 
   @Rule
-  public final ProjectAnalysisRule projectAnalysisRule = ProjectAnalysisRule.from(orchestrator);
+  public final ProjectAnalysisRule projectAnalysisRule = ProjectAnalysisRule.from(ORCHESTRATOR);
 
   private ProjectAnalysis analysisWithIssues;
   private ProjectAnalysis analysisWithoutIssues;
@@ -50,7 +41,7 @@ public class IssueWorkflowTest {
 
   @Before
   public void before() {
-    String oneIssuePerFileProfileKey = projectAnalysisRule.registerProfile("/issue/suite/IssueWorkflowTest/xoo-one-issue-per-line-profile.xml");
+    String oneIssuePerFileProfileKey = projectAnalysisRule.registerProfile("/issue/IssueWorkflowTest/xoo-one-issue-per-line-profile.xml");
     String analyzedProjectKey = projectAnalysisRule.registerProject("issue/workflow");
     analysisWithIssues = projectAnalysisRule.newProjectAnalysis(analyzedProjectKey).withQualityProfile(oneIssuePerFileProfileKey);
     analysisWithoutIssues = analysisWithIssues.withXooEmptyProfile();
diff --git a/it/it-tests/src/test/java/issue/suite/ManualRulesTest.java b/it/it-tests/src/test/java/it/issue/ManualRulesTest.java
index e7ded7a6f62..89e72faecce 100644
--- a/it/it-tests/src/test/java/issue/suite/ManualRulesTest.java
+++ b/it/it-tests/src/test/java/it/issue/ManualRulesTest.java
@@ -17,26 +17,21 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package issue.suite;
+package it.issue;
 
-import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.selenium.Selenese;
 import java.sql.Connection;
 import java.sql.SQLException;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.ClassRule;
 import org.junit.Test;
 import util.selenium.SeleneseTest;
 
-public class ManualRulesTest {
-
-  @ClassRule
-  public static Orchestrator orchestrator = IssueTestSuite.ORCHESTRATOR;
+public class ManualRulesTest extends AbstractIssueTest {
 
   @BeforeClass
   public static void setup() throws Exception {
-    orchestrator.resetData();
+    ORCHESTRATOR.resetData();
     deleteManualRules();
   }
 
@@ -50,14 +45,14 @@ public class ManualRulesTest {
     Selenese selenese = Selenese
       .builder()
       .setHtmlTestsInClasspath("manual-rules",
-        "/issue/suite/ManualRulesTest/create_edit_delete_manual_rule.html"
+        "/issue/ManualRulesTest/create_edit_delete_manual_rule.html"
       ).build();
-    new SeleneseTest(selenese).runOn(orchestrator);
+    new SeleneseTest(selenese).runOn(ORCHESTRATOR);
   }
 
-  protected static void deleteManualRules(){
+  protected static void deleteManualRules() {
     try {
-      Connection connection = orchestrator.getDatabase().openConnection();
+      Connection connection = ORCHESTRATOR.getDatabase().openConnection();
       connection.prepareStatement("DELETE FROM rules WHERE rules.plugin_name='manual'").execute();
     } catch (SQLException e) {
       throw new IllegalStateException("Fail to remove manual rules", e);
diff --git a/it/it-tests/src/test/java/analysis/suite/measure/NewDebtRatioMeasureTest.java b/it/it-tests/src/test/java/it/measure/NewDebtRatioMeasureTest.java
index 1c92aaac6a2..2761bf490d3 100644
--- a/it/it-tests/src/test/java/analysis/suite/measure/NewDebtRatioMeasureTest.java
+++ b/it/it-tests/src/test/java/it/measure/NewDebtRatioMeasureTest.java
@@ -1,8 +1,8 @@
-package analysis.suite.measure;
+package it.measure;
 
-import analysis.suite.AnalysisTestSuite;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.locator.FileLocation;
+import it.Category2Suite;
 import java.util.List;
 import javax.annotation.Nullable;
 import org.junit.Before;
@@ -24,7 +24,7 @@ public class NewDebtRatioMeasureTest {
   private static final String NEW_DEBT_RATIO_METRIC_KEY = "new_sqale_debt_ratio";
 
   @ClassRule
-  public static Orchestrator orchestrator = AnalysisTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category2Suite.ORCHESTRATOR;
 
   @Before
   public void cleanUpAnalysisData() {
@@ -76,17 +76,17 @@ public class NewDebtRatioMeasureTest {
   }
 
   private void defineQualityProfile(String qualityProfileKey) {
-    orchestrator.getServer().restoreProfile(FileLocation.ofClasspath("/measure/suite/" + qualityProfileKey + ".xml"));
+    orchestrator.getServer().restoreProfile(FileLocation.ofClasspath("/measure/" + qualityProfileKey + ".xml"));
   }
 
   private void runSampleProjectAnalysis(String projectVersion, String... properties) {
     ItUtils.runVerboseProjectAnalysis(
-        NewDebtRatioMeasureTest.orchestrator,
-        "measure/xoo-new-debt-ratio-" + projectVersion,
-        ItUtils.concat(properties,
-            // disable standard scm support so that it does not interfere with Xoo Scm sensor
-            "sonar.scm.disabled", "false")
-    );
+      NewDebtRatioMeasureTest.orchestrator,
+      "measure/xoo-new-debt-ratio-" + projectVersion,
+      ItUtils.concat(properties,
+        // disable standard scm support so that it does not interfere with Xoo Scm sensor
+        "sonar.scm.disabled", "false")
+      );
   }
 
   private Resource getFileResourceWithVariations(String metricKey) {
diff --git a/it/it-tests/src/test/java/analysis/suite/measure/TechnicalDebtMeasureVariationTest.java b/it/it-tests/src/test/java/it/measure/TechnicalDebtMeasureVariationTest.java
index a28f40fe645..b115f076866 100644
--- a/it/it-tests/src/test/java/analysis/suite/measure/TechnicalDebtMeasureVariationTest.java
+++ b/it/it-tests/src/test/java/it/measure/TechnicalDebtMeasureVariationTest.java
@@ -1,8 +1,8 @@
-package analysis.suite.measure;
+package it.measure;
 
-import analysis.suite.AnalysisTestSuite;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.locator.FileLocation;
+import it.Category2Suite;
 import java.util.List;
 import org.junit.Before;
 import org.junit.ClassRule;
@@ -14,14 +14,13 @@ import util.ItUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-
 /**
  * SONAR-4776
  */
 public class TechnicalDebtMeasureVariationTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = AnalysisTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category2Suite.ORCHESTRATOR;
 
   @Before
   public void cleanUpAnalysisData() {
@@ -51,7 +50,8 @@ public class TechnicalDebtMeasureVariationTest {
     // Third analysis, with exactly the same profile -> no new issues so no new technical debt
     runSampleProjectAnalysis();
 
-    newTechnicalDebt = orchestrator.getServer().getWsClient().find(ResourceQuery.createForMetrics("sample:src/main/xoo/sample/Sample.xoo", "new_technical_debt").setIncludeTrends(true));
+    newTechnicalDebt = orchestrator.getServer().getWsClient()
+      .find(ResourceQuery.createForMetrics("sample:src/main/xoo/sample/Sample.xoo", "new_technical_debt").setIncludeTrends(true));
 
     // No variation => measure is purged
     assertThat(newTechnicalDebt).isNull();
@@ -105,7 +105,8 @@ public class TechnicalDebtMeasureVariationTest {
     List<Measure> measures = newTechnicalDebt.getMeasures();
     assertThat(measures.get(0).getVariation2()).isEqualTo(90);
 
-    // Fourth analysis, with exactly the same profile -> no new issues so no new technical debt since previous analysis but still since 30 days
+    // Fourth analysis, with exactly the same profile -> no new issues so no new technical debt since previous analysis but still since 30
+    // days
     runSampleProjectAnalysis("sonar.oneIssuePerFile.effortToFix", "10");
 
     newTechnicalDebt = getSampleProjectResourceWithVariations("new_technical_debt");
@@ -142,7 +143,7 @@ public class TechnicalDebtMeasureVariationTest {
   }
 
   private void defineQualityProfile(String qualityProfileKey) {
-    orchestrator.getServer().restoreProfile(FileLocation.ofClasspath("/measure/suite/" + qualityProfileKey + ".xml"));
+    orchestrator.getServer().restoreProfile(FileLocation.ofClasspath("/measure/" + qualityProfileKey + ".xml"));
   }
 
   private void runSampleProjectAnalysis(String... properties) {
@@ -154,4 +155,3 @@ public class TechnicalDebtMeasureVariationTest {
   }
 
 }
-
diff --git a/it/it-tests/src/test/java/analysis/suite/measure/MeasureFiltersTest.java b/it/it-tests/src/test/java/it/measureFilter/MeasureFiltersTest.java
index db4aec15f98..1dc0f5acb44 100644
--- a/it/it-tests/src/test/java/analysis/suite/measure/MeasureFiltersTest.java
+++ b/it/it-tests/src/test/java/it/measureFilter/MeasureFiltersTest.java
@@ -17,12 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package analysis.suite.measure;
+package it.measureFilter;
 
-import analysis.suite.AnalysisTestSuite;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
 import com.sonar.orchestrator.selenium.Selenese;
+import it.Category2Suite;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -36,7 +36,7 @@ import static util.ItUtils.projectDir;
 public class MeasureFiltersTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = AnalysisTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category2Suite.ORCHESTRATOR;
 
   @BeforeClass
   public static void scanStruts() {
@@ -54,14 +54,14 @@ public class MeasureFiltersTest {
   @Test
   public void execute_measure_filters() {
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("execution_of_measure_filters",
-      "/measure/suite/measure_filters/link_from_main_header.html",
-      "/measure/suite/measure_filters/initial_search_form.html",
-      "/measure/suite/measure_filters/search_for_projects.html",
-      "/measure/suite/measure_filters/search_for_files.html",
+      "/measureFilter/MeasureFiltersTest/link_from_main_header.html",
+      "/measureFilter/MeasureFiltersTest/initial_search_form.html",
+      "/measureFilter/MeasureFiltersTest/search_for_projects.html",
+      "/measureFilter/MeasureFiltersTest/search_for_files.html",
       // SONAR-4195
-      "/measure/suite/measure_filters/search-by-key.html",
-      "/measure/suite/measure_filters/search-by-name.html",
-      "/measure/suite/measure_filters/empty_filter.html"
+      "/measureFilter/MeasureFiltersTest/search-by-key.html",
+      "/measureFilter/MeasureFiltersTest/search-by-name.html",
+      "/measureFilter/MeasureFiltersTest/empty_filter.html"
       ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
   }
@@ -69,11 +69,11 @@ public class MeasureFiltersTest {
   @Test
   public void display_measure_filter_as_list() {
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("display_measure_filter_as_list",
-      "/measure/suite/measure_filters/list_change_columns.html",
-      "/measure/suite/measure_filters/list_delete_column.html",
-      "/measure/suite/measure_filters/list_move_columns.html",
-      "/measure/suite/measure_filters/list_sort_by_descending_name.html",
-      "/measure/suite/measure_filters/list_sort_by_ncloc.html"
+      "/measureFilter/MeasureFiltersTest/list_change_columns.html",
+      "/measureFilter/MeasureFiltersTest/list_delete_column.html",
+      "/measureFilter/MeasureFiltersTest/list_move_columns.html",
+      "/measureFilter/MeasureFiltersTest/list_sort_by_descending_name.html",
+      "/measureFilter/MeasureFiltersTest/list_sort_by_ncloc.html"
       ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
   }
@@ -87,7 +87,7 @@ public class MeasureFiltersTest {
     try {
       Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("share_measure_filters",
         // SONAR-4469
-        "/measure/suite/measure_filters/should-unshare-filter-remove-other-filters-favourite.html"
+        "/measureFilter/MeasureFiltersTest/should-unshare-filter-remove-other-filters-favourite.html"
         ).build();
       new SeleneseTest(selenese).runOn(orchestrator);
     } finally {
@@ -105,7 +105,7 @@ public class MeasureFiltersTest {
 
     try {
       new SeleneseTest(Selenese.builder().setHtmlTestsInClasspath("should_not_share_filter_when_user_have_no_sharing_permissions",
-        "/measure/suite/measure_filters/should-not-share-filter-when-user-have-no-sharing-permissions.html"
+        "/measureFilter/MeasureFiltersTest/should-not-share-filter-when-user-have-no-sharing-permissions.html"
         ).build()).runOn(orchestrator);
     } finally {
       deactivateUser(user);
@@ -115,8 +115,8 @@ public class MeasureFiltersTest {
   @Test
   public void copy_measure_filters() {
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("copy_measure_filters",
-      "/measure/suite/measure_filters/copy_measure_filter.html",
-      "/measure/suite/measure_filters/copy_uniqueness_of_name.html"
+      "/measureFilter/MeasureFiltersTest/copy_measure_filter.html",
+      "/measureFilter/MeasureFiltersTest/copy_uniqueness_of_name.html"
       ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
   }
@@ -124,7 +124,7 @@ public class MeasureFiltersTest {
   @Test
   public void manage_measure_filters() {
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("manage_measure_filters",
-      "/measure/suite/measure_filters/save_with_special_characters.html"
+      "/measureFilter/MeasureFiltersTest/save_with_special_characters.html"
       ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
   }
@@ -132,9 +132,9 @@ public class MeasureFiltersTest {
   @Test
   public void measure_filter_list_widget() {
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("measure_filter_list_widget",
-      "/measure/suite/measure_filters/list_widget.html",
-      "/measure/suite/measure_filters/list_widget_sort.html",
-      "/measure/suite/measure_filters/list_widget_warning_if_missing_filter.html"
+      "/measureFilter/MeasureFiltersTest/list_widget.html",
+      "/measureFilter/MeasureFiltersTest/list_widget_sort.html",
+      "/measureFilter/MeasureFiltersTest/list_widget_warning_if_missing_filter.html"
       ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
   }
diff --git a/it/it-tests/src/test/java/analysis/suite/measure/DifferentialPeriodsTest.java b/it/it-tests/src/test/java/it/measureHistory/DifferentialPeriodsTest.java
index b1119b7e7b6..f4a194fed92 100644
--- a/it/it-tests/src/test/java/analysis/suite/measure/DifferentialPeriodsTest.java
+++ b/it/it-tests/src/test/java/it/measureHistory/DifferentialPeriodsTest.java
@@ -1,9 +1,9 @@
-package analysis.suite.measure;
+package it.measureHistory;
 
-import analysis.suite.AnalysisTestSuite;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
 import com.sonar.orchestrator.locator.FileLocation;
+import it.Category2Suite;
 import java.util.List;
 import org.junit.After;
 import org.junit.Before;
@@ -16,11 +16,10 @@ import util.ItUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-
 public class DifferentialPeriodsTest {
 
   @ClassRule
-  public static final Orchestrator orchestrator = AnalysisTestSuite.ORCHESTRATOR;
+  public static final Orchestrator orchestrator = Category2Suite.ORCHESTRATOR;
 
   @Before
   public void cleanUpAnalysisData() {
@@ -46,16 +45,16 @@ public class DifferentialPeriodsTest {
     orchestrator.getServer().provisionProject("sample", "sample");
     orchestrator.getServer().associateProjectToQualityProfile("sample", "xoo", "empty");
     orchestrator.executeBuild(SonarRunner.create(ItUtils.projectDir("shared/xoo-sample"))
-        .setProperty("sonar.projectDate", "2013-01-01"));
+      .setProperty("sonar.projectDate", "2013-01-01"));
 
     // Second analysis -> issues will be created
-    orchestrator.getServer().restoreProfile(FileLocation.ofClasspath("/measure/suite/one-issue-per-line.xml"));
+    orchestrator.getServer().restoreProfile(FileLocation.ofClasspath("/measureHistory/one-issue-per-line-profile.xml"));
     orchestrator.getServer().associateProjectToQualityProfile("sample", "xoo", "one-issue-per-line");
     orchestrator.executeBuild(SonarRunner.create(ItUtils.projectDir("shared/xoo-sample")));
 
     // New technical debt only comes from new issues
     Resource newTechnicalDebt = orchestrator.getServer().getWsClient()
-        .find(ResourceQuery.createForMetrics("sample:src/main/xoo/sample/Sample.xoo", "new_technical_debt").setIncludeTrends(true));
+      .find(ResourceQuery.createForMetrics("sample:src/main/xoo/sample/Sample.xoo", "new_technical_debt").setIncludeTrends(true));
     List<Measure> measures = newTechnicalDebt.getMeasures();
     assertThat(measures.get(0).getVariation4()).isEqualTo(17);
     assertThat(measures.get(0).getVariation5()).isEqualTo(17);
@@ -65,8 +64,8 @@ public class DifferentialPeriodsTest {
     orchestrator.executeBuild(SonarRunner.create(ItUtils.projectDir("shared/xoo-sample")));
 
     newTechnicalDebt = orchestrator.getServer().getWsClient().find(
-        ResourceQuery.createForMetrics("sample:src/main/xoo/sample/Sample.xoo", "new_technical_debt").setIncludeTrends(true)
-    );
+      ResourceQuery.createForMetrics("sample:src/main/xoo/sample/Sample.xoo", "new_technical_debt").setIncludeTrends(true)
+      );
 
     // No variation => measure is purged
     assertThat(newTechnicalDebt).isNull();
@@ -78,11 +77,10 @@ public class DifferentialPeriodsTest {
 
   private static void setProperty(String propertyKey, String propertyValue) {
     orchestrator.getServer().adminWsClient().post(
-        "/api/properties?",
-        "id", propertyKey,
-        "value", propertyValue
-    );
+      "/api/properties?",
+      "id", propertyKey,
+      "value", propertyValue
+      );
   }
 
 }
-
diff --git a/it/it-tests/src/test/java/analysis/suite/measure/TimeMachineTest.java b/it/it-tests/src/test/java/it/measureHistory/TimeMachineTest.java
index b1c41912130..d5d2ebe7cbe 100644
--- a/it/it-tests/src/test/java/analysis/suite/measure/TimeMachineTest.java
+++ b/it/it-tests/src/test/java/it/measureHistory/TimeMachineTest.java
@@ -17,13 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package analysis.suite.measure;
+package it.measureHistory;
 
-import analysis.suite.AnalysisTestSuite;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.SonarRunner;
 import com.sonar.orchestrator.locator.FileLocation;
+import it.Category2Suite;
 import java.util.Date;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -42,12 +42,12 @@ public class TimeMachineTest {
   private static final String PROJECT = "sample";
 
   @ClassRule
-  public static Orchestrator orchestrator = AnalysisTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category2Suite.ORCHESTRATOR;
 
   @BeforeClass
   public static void initialize() {
     orchestrator.resetData();
-    orchestrator.getServer().restoreProfile(FileLocation.ofClasspath("/measure/suite/TimeMachineTest/one-issue-per-line-profile.xml"));
+    orchestrator.getServer().restoreProfile(FileLocation.ofClasspath("/measureHistory/one-issue-per-line-profile.xml"));
     orchestrator.getServer().provisionProject("sample", "Sample");
     orchestrator.getServer().associateProjectToQualityProfile("sample", "xoo", "one-issue-per-line");
     analyzeProject("measure/xoo-history-v1", "2014-10-19");
diff --git a/it/it-tests/src/test/java/permission/suite/IssuePermissionTest.java b/it/it-tests/src/test/java/it/permission/IssuePermissionTest.java
index 0d0efa70e14..69aaa3f0fad 100644
--- a/it/it-tests/src/test/java/permission/suite/IssuePermissionTest.java
+++ b/it/it-tests/src/test/java/it/permission/IssuePermissionTest.java
@@ -17,11 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package permission.suite;
+package it.permission;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
 import com.sonar.orchestrator.locator.FileLocation;
+import it.Category1Suite;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -40,13 +41,13 @@ import static util.ItUtils.projectDir;
 public class IssuePermissionTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = PermissionTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category1Suite.ORCHESTRATOR;
 
   @Before
   public void init() {
     orchestrator.resetData();
 
-    orchestrator.getServer().restoreProfile(FileLocation.ofClasspath("/permission/suite/one-issue-per-line-profile.xml"));
+    orchestrator.getServer().restoreProfile(FileLocation.ofClasspath("/permission/one-issue-per-line-profile.xml"));
 
     orchestrator.getServer().provisionProject("sample", "Sample");
     orchestrator.getServer().associateProjectToQualityProfile("sample", "xoo", "one-issue-per-line");
diff --git a/it/it-tests/src/test/java/plugins/PluginsTest.java b/it/it-tests/src/test/java/it/plugins/PluginsTest.java
index 576f2aa27d5..bc7ad0f6daa 100644
--- a/it/it-tests/src/test/java/plugins/PluginsTest.java
+++ b/it/it-tests/src/test/java/it/plugins/PluginsTest.java
@@ -3,7 +3,7 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package plugins;
+package it.plugins;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.Sets;
@@ -11,6 +11,20 @@ import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.OrchestratorBuilder;
 import com.sonar.orchestrator.build.BuildResult;
 import com.sonar.orchestrator.build.SonarRunner;
+import it.plugins.checks.AbapCheck;
+import it.plugins.checks.Check;
+import it.plugins.checks.CobolCheck;
+import it.plugins.checks.CssCheck;
+import it.plugins.checks.FlexCheck;
+import it.plugins.checks.GroovyCheck;
+import it.plugins.checks.JavaCheck;
+import it.plugins.checks.JavascriptCheck;
+import it.plugins.checks.PhpCheck;
+import it.plugins.checks.PythonCheck;
+import it.plugins.checks.RpgCheck;
+import it.plugins.checks.SwiftCheck;
+import it.plugins.checks.Validation;
+import it.plugins.checks.WebCheck;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
@@ -20,20 +34,6 @@ import org.junit.Test;
 import org.junit.rules.ErrorCollector;
 import org.sonar.updatecenter.common.Plugin;
 import org.sonar.updatecenter.common.Release;
-import plugins.checks.AbapCheck;
-import plugins.checks.Check;
-import plugins.checks.CobolCheck;
-import plugins.checks.CssCheck;
-import plugins.checks.FlexCheck;
-import plugins.checks.GroovyCheck;
-import plugins.checks.JavaCheck;
-import plugins.checks.JavascriptCheck;
-import plugins.checks.PhpCheck;
-import plugins.checks.PythonCheck;
-import plugins.checks.RpgCheck;
-import plugins.checks.SwiftCheck;
-import plugins.checks.Validation;
-import plugins.checks.WebCheck;
 
 import static org.assertj.core.api.Assertions.fail;
 
diff --git a/it/it-tests/src/test/java/plugins/Project.java b/it/it-tests/src/test/java/it/plugins/Project.java
index cd3b44f2867..e50dc245288 100644
--- a/it/it-tests/src/test/java/plugins/Project.java
+++ b/it/it-tests/src/test/java/it/plugins/Project.java
@@ -1,4 +1,4 @@
-package plugins;
+package it.plugins;
 
 import com.google.common.base.Function;
 import java.io.File;
diff --git a/it/it-tests/src/test/java/plugins/checks/AbapCheck.java b/it/it-tests/src/test/java/it/plugins/checks/AbapCheck.java
index 8564ef4d782..0eefbf55536 100644
--- a/it/it-tests/src/test/java/plugins/checks/AbapCheck.java
+++ b/it/it-tests/src/test/java/it/plugins/checks/AbapCheck.java
@@ -1,4 +1,4 @@
-package plugins.checks;
+package it.plugins.checks;
 
 public class AbapCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/plugins/checks/CCheck.java b/it/it-tests/src/test/java/it/plugins/checks/CCheck.java
index fad7e37fbbf..cb8f267bbee 100644
--- a/it/it-tests/src/test/java/plugins/checks/CCheck.java
+++ b/it/it-tests/src/test/java/it/plugins/checks/CCheck.java
@@ -1,4 +1,4 @@
-package plugins.checks;
+package it.plugins.checks;
 
 public class CCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/plugins/checks/Check.java b/it/it-tests/src/test/java/it/plugins/checks/Check.java
index 79a9603c479..55535dde419 100644
--- a/it/it-tests/src/test/java/plugins/checks/Check.java
+++ b/it/it-tests/src/test/java/it/plugins/checks/Check.java
@@ -1,4 +1,4 @@
-package plugins.checks;
+package it.plugins.checks;
 
 public interface Check {
   void validate(Validation validation);
diff --git a/it/it-tests/src/test/java/plugins/checks/CobolCheck.java b/it/it-tests/src/test/java/it/plugins/checks/CobolCheck.java
index eaa332579cc..27d6d4869b2 100644
--- a/it/it-tests/src/test/java/plugins/checks/CobolCheck.java
+++ b/it/it-tests/src/test/java/it/plugins/checks/CobolCheck.java
@@ -1,4 +1,4 @@
-package plugins.checks;
+package it.plugins.checks;
 
 public class CobolCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/plugins/checks/CppCheck.java b/it/it-tests/src/test/java/it/plugins/checks/CppCheck.java
index a87a86df9c4..9428227cceb 100644
--- a/it/it-tests/src/test/java/plugins/checks/CppCheck.java
+++ b/it/it-tests/src/test/java/it/plugins/checks/CppCheck.java
@@ -1,4 +1,4 @@
-package plugins.checks;
+package it.plugins.checks;
 
 public class CppCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/plugins/checks/CssCheck.java b/it/it-tests/src/test/java/it/plugins/checks/CssCheck.java
index f3c1df7bc22..5c1a5b961c7 100644
--- a/it/it-tests/src/test/java/plugins/checks/CssCheck.java
+++ b/it/it-tests/src/test/java/it/plugins/checks/CssCheck.java
@@ -1,4 +1,4 @@
-package plugins.checks;
+package it.plugins.checks;
 
 public class CssCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/plugins/checks/FlexCheck.java b/it/it-tests/src/test/java/it/plugins/checks/FlexCheck.java
index 3098d197753..c4024f42f14 100644
--- a/it/it-tests/src/test/java/plugins/checks/FlexCheck.java
+++ b/it/it-tests/src/test/java/it/plugins/checks/FlexCheck.java
@@ -1,4 +1,4 @@
-package plugins.checks;
+package it.plugins.checks;
 
 public class FlexCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/plugins/checks/GroovyCheck.java b/it/it-tests/src/test/java/it/plugins/checks/GroovyCheck.java
index ca5d52a5b6a..28d1dee1834 100644
--- a/it/it-tests/src/test/java/plugins/checks/GroovyCheck.java
+++ b/it/it-tests/src/test/java/it/plugins/checks/GroovyCheck.java
@@ -1,4 +1,4 @@
-package plugins.checks;
+package it.plugins.checks;
 
 public class GroovyCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/plugins/checks/JavaCheck.java b/it/it-tests/src/test/java/it/plugins/checks/JavaCheck.java
index 8b6c4a27211..d25bca5e321 100644
--- a/it/it-tests/src/test/java/plugins/checks/JavaCheck.java
+++ b/it/it-tests/src/test/java/it/plugins/checks/JavaCheck.java
@@ -1,4 +1,4 @@
-package plugins.checks;
+package it.plugins.checks;
 
 public class JavaCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/plugins/checks/JavascriptCheck.java b/it/it-tests/src/test/java/it/plugins/checks/JavascriptCheck.java
index b725349f4cc..a765c7e688b 100644
--- a/it/it-tests/src/test/java/plugins/checks/JavascriptCheck.java
+++ b/it/it-tests/src/test/java/it/plugins/checks/JavascriptCheck.java
@@ -1,4 +1,4 @@
-package plugins.checks;
+package it.plugins.checks;
 
 public class JavascriptCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/plugins/checks/PhpCheck.java b/it/it-tests/src/test/java/it/plugins/checks/PhpCheck.java
index 1ebffb5e331..a19809ec3d3 100644
--- a/it/it-tests/src/test/java/plugins/checks/PhpCheck.java
+++ b/it/it-tests/src/test/java/it/plugins/checks/PhpCheck.java
@@ -1,4 +1,4 @@
-package plugins.checks;
+package it.plugins.checks;
 
 public class PhpCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/plugins/checks/PliCheck.java b/it/it-tests/src/test/java/it/plugins/checks/PliCheck.java
index f8013fd34cf..eb6871b75fc 100644
--- a/it/it-tests/src/test/java/plugins/checks/PliCheck.java
+++ b/it/it-tests/src/test/java/it/plugins/checks/PliCheck.java
@@ -1,4 +1,4 @@
-package plugins.checks;
+package it.plugins.checks;
 
 public class PliCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/plugins/checks/PythonCheck.java b/it/it-tests/src/test/java/it/plugins/checks/PythonCheck.java
index 7b3c204e0b3..545f5a2e737 100644
--- a/it/it-tests/src/test/java/plugins/checks/PythonCheck.java
+++ b/it/it-tests/src/test/java/it/plugins/checks/PythonCheck.java
@@ -1,6 +1,6 @@
-package plugins.checks;
+package it.plugins.checks;
 
-import plugins.Project;
+import it.plugins.Project;
 
 public class PythonCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/plugins/checks/RpgCheck.java b/it/it-tests/src/test/java/it/plugins/checks/RpgCheck.java
index 8b8d77bcc49..df695588834 100644
--- a/it/it-tests/src/test/java/plugins/checks/RpgCheck.java
+++ b/it/it-tests/src/test/java/it/plugins/checks/RpgCheck.java
@@ -1,4 +1,4 @@
-package plugins.checks;
+package it.plugins.checks;
 
 public class RpgCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/plugins/checks/SwiftCheck.java b/it/it-tests/src/test/java/it/plugins/checks/SwiftCheck.java
index 19607b61f1d..2b943b4120a 100644
--- a/it/it-tests/src/test/java/plugins/checks/SwiftCheck.java
+++ b/it/it-tests/src/test/java/it/plugins/checks/SwiftCheck.java
@@ -1,4 +1,4 @@
-package plugins.checks;
+package it.plugins.checks;
 
 public class SwiftCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/plugins/checks/Validation.java b/it/it-tests/src/test/java/it/plugins/checks/Validation.java
index a4042303826..f47b4446360 100644
--- a/it/it-tests/src/test/java/plugins/checks/Validation.java
+++ b/it/it-tests/src/test/java/it/plugins/checks/Validation.java
@@ -1,8 +1,8 @@
-package plugins.checks;
+package it.plugins.checks;
 
 import com.google.common.base.Joiner;
 import com.sonar.orchestrator.Orchestrator;
-import plugins.Project;
+import it.plugins.Project;
 import java.io.File;
 import org.hamcrest.Matchers;
 import org.junit.rules.ErrorCollector;
diff --git a/it/it-tests/src/test/java/plugins/checks/VbCheck.java b/it/it-tests/src/test/java/it/plugins/checks/VbCheck.java
index 0e841a302ee..55187e96912 100644
--- a/it/it-tests/src/test/java/plugins/checks/VbCheck.java
+++ b/it/it-tests/src/test/java/it/plugins/checks/VbCheck.java
@@ -1,4 +1,4 @@
-package plugins.checks;
+package it.plugins.checks;
 
 public class VbCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/plugins/checks/WebCheck.java b/it/it-tests/src/test/java/it/plugins/checks/WebCheck.java
index c5ecf3264bf..98a9d20f5e9 100644
--- a/it/it-tests/src/test/java/plugins/checks/WebCheck.java
+++ b/it/it-tests/src/test/java/it/plugins/checks/WebCheck.java
@@ -1,4 +1,4 @@
-package plugins.checks;
+package it.plugins.checks;
 
 public class WebCheck implements Check {
 
diff --git a/it/it-tests/src/test/java/administration/suite/administration/BulkDeletionTest.java b/it/it-tests/src/test/java/it/projectAdministration/BulkDeletionTest.java
index 6d9bea7e398..bd65c92c925 100644
--- a/it/it-tests/src/test/java/administration/suite/administration/BulkDeletionTest.java
+++ b/it/it-tests/src/test/java/it/projectAdministration/BulkDeletionTest.java
@@ -17,12 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package administration.suite.administration;
+package it.projectAdministration;
 
-import administration.suite.AdministrationTestSuite;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
 import com.sonar.orchestrator.selenium.Selenese;
+import it.Category1Suite;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -33,7 +33,7 @@ import static util.ItUtils.projectDir;
 public class BulkDeletionTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = AdministrationTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category1Suite.ORCHESTRATOR;
 
   @Before
   public void deleteData() {
@@ -51,8 +51,8 @@ public class BulkDeletionTest {
     executeBuild("cameleon-3", "Bar-Sonar-Plugin");
 
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("project-bulk-deletion-on-selected-project",
-      "/administration/suite/BulkDeletionTest/project-bulk-deletion/bulk-delete-filter-projects.html"
-    ).build();
+      "/projectAdministration/BulkDeletionTest/bulk-delete-filter-projects.html"
+      ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
   }
 
@@ -61,7 +61,7 @@ public class BulkDeletionTest {
       SonarRunner.create(projectDir("shared/xoo-sample"))
         .setProjectKey(projectKey)
         .setProjectName(projectName)
-    );
+      );
   }
 
 }
diff --git a/it/it-tests/src/test/java/administration/suite/administration/ProjectAdministrationTest.java b/it/it-tests/src/test/java/it/projectAdministration/ProjectAdministrationTest.java
index d2a73d9fd93..922575d6910 100644
--- a/it/it-tests/src/test/java/administration/suite/administration/ProjectAdministrationTest.java
+++ b/it/it-tests/src/test/java/it/projectAdministration/ProjectAdministrationTest.java
@@ -17,12 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package administration.suite.administration;
 
-import administration.suite.AdministrationTestSuite;
+package it.projectAdministration;
+
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
 import com.sonar.orchestrator.selenium.Selenese;
+import it.Category1Suite;
 import java.sql.SQLException;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
@@ -51,7 +52,7 @@ public class ProjectAdministrationTest {
 
   private static final String DELETE_WS_ENDPOINT = "api/projects/bulk_delete";
   @ClassRule
-  public static Orchestrator orchestrator = AdministrationTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category1Suite.ORCHESTRATOR;
   @Rule
   public ExpectedException expectedException = ExpectedException.none();
 
@@ -120,7 +121,7 @@ public class ProjectAdministrationTest {
         "permission", "admin");
 
       new SeleneseTest(
-        Selenese.builder().setHtmlTestsInClasspath("project-deletion", "/administration/suite/ProjectAdministrationTest/project-deletion/project-deletion.html").build())
+        Selenese.builder().setHtmlTestsInClasspath("project-deletion", "/projectAdministration/ProjectAdministrationTest/project-deletion/project-deletion.html").build())
         .runOn(orchestrator);
     } finally {
       wsClient.userClient().deactivate(projectAdminUser);
@@ -146,7 +147,7 @@ public class ProjectAdministrationTest {
 
     Selenese selenese = Selenese.builder()
       .setHtmlTestsInClasspath("modify_version_of_multimodule_project",
-        "/administration/suite/ProjectAdministrationTest/project-administration/multimodule-project-modify-version.html"
+        "/projectAdministration/ProjectAdministrationTest/project-administration/multimodule-project-modify-version.html"
       ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
 
@@ -154,7 +155,7 @@ public class ProjectAdministrationTest {
 
     selenese = Selenese.builder()
       .setHtmlTestsInClasspath("delete_version_of_multimodule_project",
-        "/administration/suite/ProjectAdministrationTest/project-administration/multimodule-project-delete-version.html"
+        "/projectAdministration/ProjectAdministrationTest/project-administration/multimodule-project-delete-version.html"
       ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
 
@@ -162,6 +163,7 @@ public class ProjectAdministrationTest {
   }
 
   // SONAR-3326
+  // TODO should be moved to qualityGate
   @Test
   public void display_alerts_correctly_in_history_page() {
     QualityGateClient qgClient = orchestrator.getServer().adminWsClient().qualityGateClient();
@@ -177,7 +179,7 @@ public class ProjectAdministrationTest {
 
     Selenese selenese = Selenese.builder()
       .setHtmlTestsInClasspath("display-alerts-history-page",
-        "/administration/suite/ProjectAdministrationTest/display-alerts-history-page/should-display-alerts-correctly-history-page.html"
+        "/projectAdministration/ProjectAdministrationTest/display-alerts-history-page/should-display-alerts-correctly-history-page.html"
       ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
 
@@ -188,6 +190,7 @@ public class ProjectAdministrationTest {
   /**
    * SONAR-1352
    */
+  // TODO should be moved to qualityGate
   @Test
   public void display_period_alert_on_project_dashboard() {
     QualityGateClient qgClient = orchestrator.getServer().adminWsClient().qualityGateClient();
@@ -204,7 +207,7 @@ public class ProjectAdministrationTest {
 
     Selenese selenese = Selenese.builder()
       .setHtmlTestsInClasspath("display-period-alerts",
-        "/administration/suite/ProjectAdministrationTest/display-alerts/should-display-period-alerts-correctly.html"
+        "/projectAdministration/ProjectAdministrationTest/display-alerts/should-display-period-alerts-correctly.html"
       ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
 
@@ -221,9 +224,9 @@ public class ProjectAdministrationTest {
 
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("project-settings",
       // SONAR-3425
-      "/administration/suite/ProjectAdministrationTest/project-settings/override-global-settings.html",
+      "/projectAdministration/ProjectAdministrationTest/project-settings/override-global-settings.html",
 
-      "/administration/suite/ProjectAdministrationTest/project-settings/only-on-project-settings.html"
+      "/projectAdministration/ProjectAdministrationTest/project-settings/only-on-project-settings.html"
       ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
 
@@ -241,10 +244,10 @@ public class ProjectAdministrationTest {
 
     Selenese selenese = Selenese.builder()
       .setHtmlTestsInClasspath("project-bulk-update-keys",
-        "/administration/suite/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-duplicate-keys.html",
-        "/administration/suite/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-no-input.html",
-        "/administration/suite/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-no-match.html",
-        "/administration/suite/ProjectAdministrationTest/project-update-keys/bulk-update-success.html"
+        "/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-duplicate-keys.html",
+        "/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-no-input.html",
+        "/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-no-match.html",
+        "/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-success.html"
       ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
   }
@@ -259,8 +262,8 @@ public class ProjectAdministrationTest {
 
     Selenese selenese = Selenese.builder()
       .setHtmlTestsInClasspath("project-fine-grained-update-keys",
-        "/administration/suite/ProjectAdministrationTest/project-update-keys/fine-grained-update-impossible.html",
-        "/administration/suite/ProjectAdministrationTest/project-update-keys/fine-grained-update-success.html"
+        "/projectAdministration/ProjectAdministrationTest/project-update-keys/fine-grained-update-impossible.html",
+        "/projectAdministration/ProjectAdministrationTest/project-update-keys/fine-grained-update-success.html"
       ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
   }
@@ -274,7 +277,7 @@ public class ProjectAdministrationTest {
 
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("module-settings",
       // SONAR-3425
-      "/administration/suite/ProjectAdministrationTest/module-settings/display-module-settings.html"
+      "/projectAdministration/ProjectAdministrationTest/module-settings/display-module-settings.html"
       ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
   }
diff --git a/it/it-tests/src/test/java/qualitygate/QualityGateNotificationTest.java b/it/it-tests/src/test/java/it/qualityGate/QualityGateNotificationTest.java
index 4254a01f0f2..74ca965d61b 100644
--- a/it/it-tests/src/test/java/qualitygate/QualityGateNotificationTest.java
+++ b/it/it-tests/src/test/java/it/qualityGate/QualityGateNotificationTest.java
@@ -3,11 +3,12 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package qualitygate;
+package it.qualityGate;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
 import com.sonar.orchestrator.selenium.Selenese;
+import it.Category1Suite;
 import java.util.Iterator;
 import javax.mail.internet.MimeMessage;
 import org.junit.Before;
@@ -23,7 +24,6 @@ import org.sonar.wsclient.services.Resource;
 import org.sonar.wsclient.services.ResourceQuery;
 import org.subethamail.wiser.Wiser;
 import org.subethamail.wiser.WiserMessage;
-import util.ItUtils;
 import util.NetworkUtils;
 import util.selenium.SeleneseTest;
 
@@ -35,13 +35,7 @@ public class QualityGateNotificationTest {
   private static final String PROJECT_KEY = "sample";
 
   @ClassRule
-  public static Orchestrator orchestrator = Orchestrator.builderEnv()
-    .addPlugin(ItUtils.xooPlugin())
-
-    // 1 second. Required for notification test.
-    .setServerProperty("sonar.notifications.delay", "1")
-
-    .build();
+  public static Orchestrator orchestrator = Category1Suite.ORCHESTRATOR;
 
   @Before
   public void cleanUp() {
diff --git a/it/it-tests/src/test/java/qualitygate/QualityGateTest.java b/it/it-tests/src/test/java/it/qualityGate/QualityGateTest.java
index 5f975e93a21..39006cc4c09 100644
--- a/it/it-tests/src/test/java/qualitygate/QualityGateTest.java
+++ b/it/it-tests/src/test/java/it/qualityGate/QualityGateTest.java
@@ -3,10 +3,11 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package qualitygate;
+package it.qualityGate;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
+import it.Category1Suite;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
@@ -17,7 +18,6 @@ import org.sonar.wsclient.qualitygate.QualityGateClient;
 import org.sonar.wsclient.services.Measure;
 import org.sonar.wsclient.services.Resource;
 import org.sonar.wsclient.services.ResourceQuery;
-import util.ItUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static util.ItUtils.projectDir;
@@ -29,13 +29,7 @@ public class QualityGateTest {
   private long provisionnedProjectId = -1L;
 
   @ClassRule
-  public static Orchestrator orchestrator = Orchestrator.builderEnv()
-    .addPlugin(ItUtils.xooPlugin())
-
-    // 1 second. Required for notification test.
-    .setServerProperty("sonar.notifications.delay", "1")
-
-    .build();
+  public static Orchestrator orchestrator = Category1Suite.ORCHESTRATOR;
 
   @Before
   public void cleanUp() {
diff --git a/it/it-tests/src/test/java/it/serverSystem/DevModeTest.java b/it/it-tests/src/test/java/it/serverSystem/DevModeTest.java
new file mode 100644
index 00000000000..de451e246f7
--- /dev/null
+++ b/it/it-tests/src/test/java/it/serverSystem/DevModeTest.java
@@ -0,0 +1,87 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package it.serverSystem;
+
+import com.sonar.orchestrator.Orchestrator;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.SystemUtils;
+import org.junit.After;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.fail;
+
+/**
+ * This class start a new orchestrator on each test case
+ */
+public class DevModeTest {
+
+  Orchestrator orchestrator;
+
+  @Rule
+  public ExpectedException thrown = ExpectedException.none();
+
+  @After
+  public void stop() {
+    if (orchestrator != null) {
+      orchestrator.stop();
+    }
+  }
+
+  /**
+   * SONAR-4843
+   */
+  @Test
+  public void restart_forbidden_if_not_dev_mode() throws Exception {
+    // server classloader locks Jar files on Windows
+    if (!SystemUtils.IS_OS_WINDOWS) {
+      orchestrator = Orchestrator.builderEnv()
+        .build();
+      orchestrator.start();
+      try {
+        orchestrator.getServer().adminWsClient().systemClient().restart();
+        fail();
+      } catch (Exception e) {
+        assertThat(e.getMessage()).contains("403");
+      }
+    }
+  }
+
+  /**
+   * SONAR-4843
+   */
+  @Test
+  public void restart_on_dev_mode() throws Exception {
+    // server classloader locks Jar files on Windows
+    if (!SystemUtils.IS_OS_WINDOWS) {
+      orchestrator = Orchestrator.builderEnv()
+        .setServerProperty("sonar.web.dev", "true")
+        .build();
+      orchestrator.start();
+
+      orchestrator.getServer().adminWsClient().systemClient().restart();
+      assertThat(FileUtils.readFileToString(orchestrator.getServer().getLogs()))
+        .contains("Restart server")
+        .contains("Server restarted");
+    }
+  }
+}
diff --git a/it/it-tests/src/test/java/server/HttpsTest.java b/it/it-tests/src/test/java/it/serverSystem/HttpsTest.java
index 87ddefa1ecb..5cd162481cc 100644
--- a/it/it-tests/src/test/java/server/HttpsTest.java
+++ b/it/it-tests/src/test/java/it/serverSystem/HttpsTest.java
@@ -3,7 +3,7 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package server;
+package it.serverSystem;
 
 import com.sonar.orchestrator.Orchestrator;
 import java.io.File;
@@ -33,6 +33,9 @@ import util.NetworkUtils;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
 
+/**
+ * This class start a new orchestrator on each test case
+ */
 public class HttpsTest {
 
   public static final String HTTPS_PROTOCOLS = "https.protocols";
@@ -67,7 +70,7 @@ public class HttpsTest {
   @Test
   public void fail_to_start_if_bad_keystore_credentials() throws Exception {
     try {
-      URL jksKeystore = getClass().getResource("/server/HttpsTest/keystore.jks");
+      URL jksKeystore = getClass().getResource("/serverSystem/HttpsTest/keystore.jks");
       orchestrator = Orchestrator.builderEnv()
         .setServerProperty("sonar.web.https.port", String.valueOf(httpsPort))
         .setServerProperty("sonar.web.https.keyAlias", "tests")
@@ -86,7 +89,7 @@ public class HttpsTest {
   @Test
   public void enable_https_port() throws Exception {
     // start server
-    URL jksKeystore = getClass().getResource("/server/HttpsTest/keystore.jks");
+    URL jksKeystore = getClass().getResource("/serverSystem/HttpsTest/keystore.jks");
     orchestrator = Orchestrator.builderEnv()
       .setServerProperty("sonar.web.https.port", String.valueOf(httpsPort))
       .setServerProperty("sonar.web.https.keyAlias", "tests")
diff --git a/it/it-tests/src/test/java/it/serverSystem/ServerSystemRestartingOrchestrator.java b/it/it-tests/src/test/java/it/serverSystem/ServerSystemRestartingOrchestrator.java
new file mode 100644
index 00000000000..b67c1252b82
--- /dev/null
+++ b/it/it-tests/src/test/java/it/serverSystem/ServerSystemRestartingOrchestrator.java
@@ -0,0 +1,108 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package it.serverSystem;
+
+import com.sonar.orchestrator.Orchestrator;
+import com.sonar.orchestrator.locator.FileLocation;
+import java.io.File;
+import org.apache.commons.io.FileUtils;
+import org.junit.After;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.sonar.wsclient.services.Server;
+import org.sonar.wsclient.services.ServerQuery;
+import util.ItUtils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.fail;
+
+/**
+ * This class start a new orchestrator on each test case
+ */
+public class ServerSystemRestartingOrchestrator {
+
+  Orchestrator orchestrator;
+
+  @Rule
+  public ExpectedException thrown = ExpectedException.none();
+
+  @After
+  public void stop() {
+    if (orchestrator != null) {
+      orchestrator.stop();
+    }
+  }
+
+  /**
+   * SONAR-3516
+   */
+  @Test
+  public void check_minimal_sonar_version_at_startup() throws Exception {
+    try {
+      orchestrator = Orchestrator.builderEnv()
+        .addPlugin(FileLocation.of(new File(ServerSystemRestartingOrchestrator.class.getResource("/serverSystem/ServerSystemTest/incompatible-plugin-1.0.jar").toURI())))
+        .build();
+      orchestrator.start();
+      fail();
+    } catch (Exception e) {
+      assertThat(FileUtils.readFileToString(orchestrator.getServer().getLogs())).contains(
+        "Plugin incompatible-plugin [incompatibleplugin] requires at least SonarQube 5.9");
+    }
+  }
+
+  @Test
+  public void support_install_dir_with_whitespaces() throws Exception {
+    String dirName = "target/has space";
+    FileUtils.deleteDirectory(new File(dirName));
+    orchestrator = Orchestrator.builderEnv()
+      .setOrchestratorProperty("orchestrator.workspaceDir", dirName)
+      .build();
+    orchestrator.start();
+
+    Server.Status status = orchestrator.getServer().getAdminWsClient().find(new ServerQuery()).getStatus();
+    assertThat(status).isEqualTo(Server.Status.UP);
+  }
+
+  // SONAR-4748
+  @Test
+  public void should_create_in_temp_folder() throws Exception {
+    orchestrator = Orchestrator.builderEnv()
+      .addPlugin(ItUtils.pluginArtifact("server-plugin"))
+      .setServerProperty("sonar.createTempFiles", "true")
+      .build();
+    orchestrator.start();
+
+    File tempDir = new File(orchestrator.getServer().getHome(), "temp/tmp");
+
+    String logs = FileUtils.readFileToString(orchestrator.getServer().getLogs());
+    assertThat(logs).contains("Creating temp directory: " + tempDir.getAbsolutePath() + File.separator + "sonar-it");
+    assertThat(logs).contains("Creating temp file: " + tempDir.getAbsolutePath() + File.separator + "sonar-it");
+
+    // Verify temp folder is created
+    assertThat(new File(tempDir, "sonar-it")).isDirectory().exists();
+
+    orchestrator.stop();
+
+    // Verify temp folder is deleted after shutdown
+    assertThat(new File(tempDir, "sonar-it")).doesNotExist();
+  }
+
+}
diff --git a/it/it-tests/src/test/java/server/suite/ServerAdministrationTest.java b/it/it-tests/src/test/java/it/serverSystem/ServerSystemTest.java
index b2d85d657c2..9d6a7a4a56c 100644
--- a/it/it-tests/src/test/java/server/suite/ServerAdministrationTest.java
+++ b/it/it-tests/src/test/java/it/serverSystem/ServerSystemTest.java
@@ -3,10 +3,12 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package server.suite;
+package it.serverSystem;
 
 import com.sonar.orchestrator.Orchestrator;
+import com.sonar.orchestrator.build.SonarRunner;
 import com.sonar.orchestrator.selenium.Selenese;
+import it.Category4Suite;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
@@ -18,19 +20,26 @@ import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.util.EntityUtils;
 import org.json.simple.JSONValue;
+import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.sonar.wsclient.services.Server;
 import org.sonar.wsclient.services.ServerQuery;
+import util.ItUtils;
 import util.selenium.SeleneseTest;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
 
-public class ServerAdministrationTest {
+public class ServerSystemTest {
 
   @ClassRule
-  public static final Orchestrator orchestrator = ServerTestSuite.ORCHESTRATOR;
+  public static final Orchestrator orchestrator = Category4Suite.ORCHESTRATOR;
+
+  @Before
+  public void cleanDatabase() {
+    orchestrator.resetData();
+  }
 
   @Test
   public void get_sonar_version() {
@@ -48,24 +57,61 @@ public class ServerAdministrationTest {
   @Test
   public void generate_server_id() {
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("server_id",
-      "/server/ServerAdministrationTest/server_id/missing_ip.html",
+      "/serverSystem/ServerSystemTest/missing_ip.html",
       // SONAR-4102
-      "/server/ServerAdministrationTest/server_id/organisation_must_not_accept_special_chars.html",
-      "/server/ServerAdministrationTest/server_id/valid_id.html").build();
+      "/serverSystem/ServerSystemTest/organisation_must_not_accept_special_chars.html",
+      "/serverSystem/ServerSystemTest/valid_id.html").build();
     new SeleneseTest(selenese).runOn(orchestrator);
   }
 
   @Test
   public void display_system_info() {
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("server-administration",
-      "/server/ServerAdministrationTest/server-administration/system_info.html"
+      "/serverSystem/ServerSystemTest/system_info.html"
       ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
   }
 
   /**
+   * See http://jira.codehaus.org/browse/SONAR-2727
+   */
+  @Test
+  public void display_warnings_when_using_h2() {
+    if (orchestrator.getConfiguration().getString("sonar.jdbc.dialect").equals("h2")) {
+      Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("derby-warnings",
+        "/serverSystem/ServerSystemTest/derby-warning.html").build();
+      new SeleneseTest(selenese).runOn(orchestrator);
+    }
+  }
+
+  /**
+   * See http://jira.codehaus.org/browse/SONAR-2840
+   */
+  @Test
+  public void hide_jdbc_settings_to_non_admin() {
+    Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("jdbc-settings",
+      "/serverSystem/ServerSystemTest/hide-jdbc-settings.html").build();
+    new SeleneseTest(selenese).runOn(orchestrator);
+  }
+
+  /**
+   * SONAR-3962
+   */
+  // TODO should be moved elsewhere
+  @Test
+  public void not_fail_with_url_ending_by_jsp() {
+    orchestrator.executeBuild(SonarRunner.create(ItUtils.projectDir("shared/xoo-sample"))
+      .setProperty("sonar.projectKey", "myproject.jsp"));
+    // Access dashboard
+    Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("url_ending_by_jsp",
+      "/serverSystem/ServerSystemTest/url_ending_by_jsp.html").build();
+    new SeleneseTest(selenese).runOn(orchestrator);
+  }
+
+  /**
    * SONAR-3147
    */
+  // TODO should be moved elsewhere
   @Test
   public void test_widgets_web_service() throws IOException {
     HttpClient httpclient = new DefaultHttpClient();
@@ -91,6 +137,7 @@ public class ServerAdministrationTest {
   /**
    * SONAR-5197
    */
+  // TODO should be moved elsewhere
   @Test
   public void api_ws_shortcut() throws Exception {
     HttpClient httpclient = new DefaultHttpClient();
diff --git a/it/it-tests/src/test/java/administration/suite/administration/PropertySetsTest.java b/it/it-tests/src/test/java/it/settings/PropertySetsTest.java
index e24b9b08bd0..7a0f7b34c7e 100644
--- a/it/it-tests/src/test/java/administration/suite/administration/PropertySetsTest.java
+++ b/it/it-tests/src/test/java/it/settings/PropertySetsTest.java
@@ -17,11 +17,12 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package administration.suite.administration;
 
-import administration.suite.AdministrationTestSuite;
+package it.settings;
+
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.selenium.Selenese;
+import it.Category1Suite;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.sonar.wsclient.services.PropertyQuery;
@@ -33,15 +34,15 @@ import static org.assertj.core.api.Assertions.assertThat;
 public class PropertySetsTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = AdministrationTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category1Suite.ORCHESTRATOR;
 
   @Test
   public void should_support_property_sets() {
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("property-sets",
-      "/administration/suite/PropertySetsTest/property-sets/create.html",
-      "/administration/suite/PropertySetsTest/property-sets/delete.html",
-      "/administration/suite/PropertySetsTest/property-sets/reference.html",
-      "/administration/suite/PropertySetsTest/property-sets/all_types.html"
+      "/settings/PropertySetsTest/property-sets/create.html",
+      "/settings/PropertySetsTest/property-sets/delete.html",
+      "/settings/PropertySetsTest/property-sets/reference.html",
+      "/settings/PropertySetsTest/property-sets/all_types.html"
       ).build();
     // Use the old runner because it fails with the new Selenium runner
     orchestrator.executeSelenese(selenese);
@@ -70,8 +71,8 @@ public class PropertySetsTest {
   public void should_support_property_sets_with_auto_generated_keys() {
     new SeleneseTest(
       Selenese.builder().setHtmlTestsInClasspath("create-auto-generated",
-      "/administration/suite/PropertySetsTest/auto-generated/create.html"
-      ).build()).runOn(orchestrator);
+        "/settings/PropertySetsTest/auto-generated/create.html"
+        ).build()).runOn(orchestrator);
 
     String[] keys = getProperty("sonar.autogenerated").split("[,]");
     assertThat(getProperty("sonar.autogenerated." + keys[0] + ".value")).isEqualTo("FIRST");
@@ -79,7 +80,7 @@ public class PropertySetsTest {
     assertThat(getProperty("sonar.autogenerated." + keys[2] + ".value")).isEqualTo("THIRD");
 
     new SeleneseTest(Selenese.builder().setHtmlTestsInClasspath("update-auto-generated",
-      "/administration/suite/PropertySetsTest/auto-generated/update.html"
+      "/settings/PropertySetsTest/auto-generated/update.html"
       ).build()).runOn(orchestrator);
 
     keys = getProperty("sonar.autogenerated").split("[,]");
diff --git a/it/it-tests/src/test/java/it/settings/SettingsTest.java b/it/it-tests/src/test/java/it/settings/SettingsTest.java
new file mode 100644
index 00000000000..79e5a62993b
--- /dev/null
+++ b/it/it-tests/src/test/java/it/settings/SettingsTest.java
@@ -0,0 +1,56 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package it.settings;
+
+import com.sonar.orchestrator.Orchestrator;
+import com.sonar.orchestrator.selenium.Selenese;
+import it.Category1Suite;
+import java.io.IOException;
+import org.apache.commons.io.FileUtils;
+import org.junit.ClassRule;
+import org.junit.Test;
+import util.selenium.SeleneseTest;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class SettingsTest {
+
+  @ClassRule
+  public static Orchestrator orchestrator = Category1Suite.ORCHESTRATOR;
+
+  // SONAR-4404
+  @Test
+  public void should_get_settings_default_value() {
+    Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("settings-default-value",
+      "/settings/SettingsTest/settings-default-value.html").build();
+    new SeleneseTest(selenese).runOn(orchestrator);
+  }
+
+  /**
+   * SONAR-3320
+   */
+  @Test
+  public void global_property_change_extension_point() throws IOException {
+    orchestrator.getServer().adminWsClient().post("api/properties/create?id=globalPropertyChange.received&value=NEWVALUE");
+    assertThat(FileUtils.readFileToString(orchestrator.getServer().getLogs()).contains("Received change: NEWVALUE"));
+  }
+
+}
diff --git a/it/it-tests/src/test/java/it/settings/SettingsTestRestartingOrchestrator.java b/it/it-tests/src/test/java/it/settings/SettingsTestRestartingOrchestrator.java
new file mode 100644
index 00000000000..20c69447378
--- /dev/null
+++ b/it/it-tests/src/test/java/it/settings/SettingsTestRestartingOrchestrator.java
@@ -0,0 +1,109 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+package it.settings;
+
+import com.sonar.orchestrator.Orchestrator;
+import com.sonar.orchestrator.build.SonarRunner;
+import com.sonar.orchestrator.selenium.Selenese;
+import java.net.URL;
+import org.junit.After;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import util.ItUtils;
+import util.selenium.SeleneseTest;
+
+import static util.ItUtils.*;
+
+/**
+ * This class start a new orchestrator on each test case
+ */
+public class SettingsTestRestartingOrchestrator {
+
+  Orchestrator orchestrator;
+
+  @Rule
+  public ExpectedException thrown = ExpectedException.none();
+
+  @After
+  public void stop() {
+    if (orchestrator != null) {
+      orchestrator.stop();
+    }
+  }
+
+  @Test
+  public void test_settings() {
+    URL secretKeyUrl = getClass().getResource("/settings/SettingsTest/sonar-secret.txt");
+    orchestrator = Orchestrator.builderEnv()
+      .addPlugin(pluginArtifact("settings-plugin"))
+      .addPlugin(pluginArtifact("license-plugin"))
+      .setServerProperty("sonar.secretKeyPath", secretKeyUrl.getFile())
+      .build();
+    orchestrator.start();
+
+    Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("test_settings",
+      "/settings/SettingsTest/general-settings.html",
+
+      // SONAR-2869 the annotation @Properties can be used on extensions and not only on plugin entry points
+      "/settings/SettingsTest/hidden-extension-property.html",
+      "/settings/SettingsTest/global-extension-property.html",
+
+      // SONAR-3344 - licenses
+      "/settings/SettingsTest/ignore-corrupted-license.html",
+      "/settings/SettingsTest/display-license.html",
+      "/settings/SettingsTest/display-untyped-license.html",
+
+      // SONAR-2084 - encryption
+      "/settings/SettingsTest/generate-secret-key.html",
+      "/settings/SettingsTest/encrypt-text.html",
+
+      // SONAR-1378 - property types
+      "/settings/SettingsTest/validate-property-type.html",
+
+      // SONAR-3127 - hide passwords
+      "/settings/SettingsTest/hide-passwords.html"
+      ).build();
+    new SeleneseTest(selenese).runOn(orchestrator);
+  }
+
+  @Test
+  public void property_relocation() {
+    orchestrator = Orchestrator.builderEnv()
+      .addPlugin(pluginArtifact("property-relocation-plugin"))
+      .addPlugin(xooPlugin())
+      .setServerProperty("sonar.deprecatedKey", "true")
+      .build();
+    orchestrator.start();
+
+    SonarRunner withDeprecatedKey = SonarRunner.create(projectDir("shared/xoo-sample"))
+      .setProperty("sonar.deprecatedKey", "true");
+    SonarRunner withNewKey = SonarRunner.create(projectDir("shared/xoo-sample"))
+      .setProperty("sonar.newKey", "true");
+    // should not fail
+    orchestrator.executeBuilds(withDeprecatedKey, withNewKey);
+
+    Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("property_relocation",
+      "/settings/SettingsTest/property_relocation.html"
+      ).build();
+    new SeleneseTest(selenese).runOn(orchestrator);
+  }
+
+}
diff --git a/it/it-tests/src/test/java/administration/suite/administration/SubCategoriesTest.java b/it/it-tests/src/test/java/it/settings/SubCategoriesTest.java
index e733108ada0..7db05792537 100644
--- a/it/it-tests/src/test/java/administration/suite/administration/SubCategoriesTest.java
+++ b/it/it-tests/src/test/java/it/settings/SubCategoriesTest.java
@@ -17,12 +17,13 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package administration.suite.administration;
 
-import administration.suite.AdministrationTestSuite;
+package it.settings;
+
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
 import com.sonar.orchestrator.selenium.Selenese;
+import it.Category1Suite;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.sonar.wsclient.services.PropertyQuery;
@@ -34,7 +35,7 @@ import static util.ItUtils.projectDir;
 public class SubCategoriesTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = AdministrationTestSuite.ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category1Suite.ORCHESTRATOR;
 
   /**
    * SONAR-3159
@@ -42,9 +43,9 @@ public class SubCategoriesTest {
   @Test
   public void should_support_global_subcategories() {
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("subcategories",
-      "/administration/suite/SubCategoriesTest/subcategories/global-subcategories.html",
+      "/settings/subcategories/global-subcategories.html",
       // SONAR-4495
-      "/administration/suite/SubCategoriesTest/subcategories/global-subcategories-no-default.html"
+      "/settings/subcategories/global-subcategories-no-default.html"
       ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
     assertThat(getProperty("prop3", null)).isEqualTo("myValue");
@@ -58,9 +59,9 @@ public class SubCategoriesTest {
     orchestrator.executeBuild(SonarRunner.create(projectDir("shared/xoo-sample")));
 
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("subcategories",
-      "/administration/suite/SubCategoriesTest/subcategories/project-subcategories.html",
+      "/settings/subcategories/project-subcategories.html",
       // SONAR-4495
-      "/administration/suite/SubCategoriesTest/subcategories/project-subcategories-no-default.html"
+      "/settings/subcategories/project-subcategories-no-default.html"
       ).build();
     new SeleneseTest(selenese).runOn(orchestrator);
     assertThat(getProperty("prop3", "sample")).isEqualTo("myValue2");
diff --git a/it/it-tests/src/test/java/analysis/suite/testing/CoverageTest.java b/it/it-tests/src/test/java/it/test/CoverageTest.java
index c2932c5ae2e..1ca241841cb 100644
--- a/it/it-tests/src/test/java/analysis/suite/testing/CoverageTest.java
+++ b/it/it-tests/src/test/java/it/test/CoverageTest.java
@@ -3,10 +3,11 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package analysis.suite.testing;
+package it.test;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
+import it.Category2Suite;
 import java.io.File;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
@@ -18,14 +19,13 @@ import org.skyscreamer.jsonassert.JSONAssert;
 import org.sonar.wsclient.services.Resource;
 import org.sonar.wsclient.services.ResourceQuery;
 
-import static analysis.suite.AnalysisTestSuite.ORCHESTRATOR;
 import static org.assertj.core.api.Assertions.assertThat;
 import static util.ItUtils.projectDir;
 
 public class CoverageTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category2Suite.ORCHESTRATOR;
 
   private static final String[] ALL_COVERAGE_METRICS = new String[] {
     "line_coverage", "lines_to_cover", "uncovered_lines", "branch_coverage", "conditions_to_cover", "uncovered_conditions", "coverage",
@@ -57,7 +57,7 @@ public class CoverageTest {
     assertThat(project.getMeasureValue("overall_coverage")).isNull();
 
     String coverage = orchestrator.getServer().adminWsClient().get("api/sources/lines", "key", "sample-ut-coverage:src/main/xoo/sample/Sample.xoo");
-    JSONAssert.assertEquals(IOUtils.toString(this.getClass().getResourceAsStream("/testing/suite/CoverageTest/unit_test_coverage-expected.json"), "UTF-8"), coverage, false);
+    JSONAssert.assertEquals(IOUtils.toString(this.getClass().getResourceAsStream("/test/CoverageTest/unit_test_coverage-expected.json"), "UTF-8"), coverage, false);
 
     verifyComputeEngineTempDirIsEmpty();
   }
@@ -80,7 +80,8 @@ public class CoverageTest {
     assertThat(project.getMeasureValue("overall_coverage")).isNull();
 
     String coverage = orchestrator.getServer().adminWsClient().get("api/sources/lines", "key", "sample-ut-coverage:src/main/xoo/sample/Sample.xoo");
-    JSONAssert.assertEquals(IOUtils.toString(this.getClass().getResourceAsStream("/testing/suite/CoverageTest/unit_test_coverage_no_condition-expected.json"), "UTF-8"), coverage, false);
+    JSONAssert.assertEquals(IOUtils.toString(this.getClass().getResourceAsStream("/test/CoverageTest/unit_test_coverage_no_condition-expected.json"), "UTF-8"), coverage,
+      false);
 
     verifyComputeEngineTempDirIsEmpty();
   }
@@ -103,7 +104,7 @@ public class CoverageTest {
     assertThat(project.getMeasureValue("overall_coverage")).isNull();
 
     String coverage = orchestrator.getServer().adminWsClient().get("api/sources/lines", "key", "sample-it-coverage:src/main/xoo/sample/Sample.xoo");
-    JSONAssert.assertEquals(IOUtils.toString(this.getClass().getResourceAsStream("/testing/suite/CoverageTest/it_coverage-expected.json"), "UTF-8"), coverage, false);
+    JSONAssert.assertEquals(IOUtils.toString(this.getClass().getResourceAsStream("/test/CoverageTest/it_coverage-expected.json"), "UTF-8"), coverage, false);
 
     verifyComputeEngineTempDirIsEmpty();
   }
@@ -138,7 +139,7 @@ public class CoverageTest {
     assertThat(project.getMeasureValue("overall_coverage")).isEqualTo(62.5);
 
     String coverage = orchestrator.getServer().adminWsClient().get("api/sources/lines", "key", "sample-overall-coverage:src/main/xoo/sample/Sample.xoo");
-    JSONAssert.assertEquals(IOUtils.toString(this.getClass().getResourceAsStream("/testing/suite/CoverageTest/ut_and_it_coverage-expected.json"), "UTF-8"), coverage, false);
+    JSONAssert.assertEquals(IOUtils.toString(this.getClass().getResourceAsStream("/test/CoverageTest/ut_and_it_coverage-expected.json"), "UTF-8"), coverage, false);
 
     verifyComputeEngineTempDirIsEmpty();
   }
diff --git a/it/it-tests/src/test/java/analysis/suite/testing/CoverageTrackingTest.java b/it/it-tests/src/test/java/it/test/CoverageTrackingTest.java
index a84e4ace549..c525fe12f08 100644
--- a/it/it-tests/src/test/java/analysis/suite/testing/CoverageTrackingTest.java
+++ b/it/it-tests/src/test/java/it/test/CoverageTrackingTest.java
@@ -3,10 +3,11 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package analysis.suite.testing;
+package it.test;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
+import it.Category2Suite;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.apache.commons.io.IOUtils;
@@ -15,13 +16,12 @@ import org.junit.ClassRule;
 import org.junit.Test;
 import org.skyscreamer.jsonassert.JSONAssert;
 
-import static analysis.suite.AnalysisTestSuite.ORCHESTRATOR;
 import static util.ItUtils.projectDir;
 
 public class CoverageTrackingTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category2Suite.ORCHESTRATOR;
 
   @Before
   public void delete_data() {
@@ -33,11 +33,12 @@ public class CoverageTrackingTest {
     orchestrator.executeBuilds(SonarRunner.create(projectDir("testing/xoo-sample-with-coverage-per-test")));
 
     String tests = orchestrator.getServer().adminWsClient().get("api/tests/list", "testFileKey", "sample-with-tests:src/test/xoo/sample/SampleTest.xoo");
-    JSONAssert.assertEquals(IOUtils.toString(this.getClass().getResourceAsStream("/testing/suite/CoverageTrackingTest/tests-expected.json"), "UTF-8"), tests, false);
+    JSONAssert.assertEquals(IOUtils.toString(this.getClass().getResourceAsStream("/test/CoverageTrackingTest/tests-expected.json"), "UTF-8"), tests, false);
 
     String covered_files = orchestrator.getServer().adminWsClient()
       .get("api/tests/covered_files", "testId", extractSuccessfulTestId(tests));
-    JSONAssert.assertEquals(IOUtils.toString(this.getClass().getResourceAsStream("/testing/suite/CoverageTrackingTest/covered_files-expected.json"), "UTF-8"), covered_files, false);
+    JSONAssert
+      .assertEquals(IOUtils.toString(this.getClass().getResourceAsStream("/test/CoverageTrackingTest/covered_files-expected.json"), "UTF-8"), covered_files, false);
   }
 
   private String extractSuccessfulTestId(String json) {
diff --git a/it/it-tests/src/test/java/analysis/suite/testing/NewCoverageTest.java b/it/it-tests/src/test/java/it/test/NewCoverageTest.java
index fc4427b243b..12ff7d23980 100644
--- a/it/it-tests/src/test/java/analysis/suite/testing/NewCoverageTest.java
+++ b/it/it-tests/src/test/java/it/test/NewCoverageTest.java
@@ -17,10 +17,11 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package analysis.suite.testing;
+package it.test;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
+import it.Category2Suite;
 import org.assertj.core.data.Offset;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -28,14 +29,13 @@ import org.junit.Test;
 import org.sonar.wsclient.services.Resource;
 import org.sonar.wsclient.services.ResourceQuery;
 
-import static analysis.suite.AnalysisTestSuite.ORCHESTRATOR;
 import static org.assertj.core.api.Assertions.assertThat;
 import static util.ItUtils.projectDir;
 
 public class NewCoverageTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category2Suite.ORCHESTRATOR;
 
   private static final String PROJECT_KEY = "sample-new-coverage";
 
diff --git a/it/it-tests/src/test/java/analysis/suite/testing/TestExecutionTest.java b/it/it-tests/src/test/java/it/test/TestExecutionTest.java
index 789988940cd..e3e299be00f 100644
--- a/it/it-tests/src/test/java/analysis/suite/testing/TestExecutionTest.java
+++ b/it/it-tests/src/test/java/it/test/TestExecutionTest.java
@@ -3,10 +3,11 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package analysis.suite.testing;
+package it.test;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
+import it.Category2Suite;
 import org.apache.commons.io.IOUtils;
 import org.junit.Before;
 import org.junit.ClassRule;
@@ -15,14 +16,13 @@ import org.skyscreamer.jsonassert.JSONAssert;
 import org.sonar.wsclient.services.Resource;
 import org.sonar.wsclient.services.ResourceQuery;
 
-import static analysis.suite.AnalysisTestSuite.ORCHESTRATOR;
 import static org.assertj.core.api.Assertions.assertThat;
 import static util.ItUtils.projectDir;
 
 public class TestExecutionTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = ORCHESTRATOR;
+  public static Orchestrator orchestrator = Category2Suite.ORCHESTRATOR;
 
   @Before
   public void delete_data() {
@@ -43,6 +43,6 @@ public class TestExecutionTest {
     assertThat(project.getMeasureIntValue("test_execution_time")).isEqualTo(8);
 
     String json = orchestrator.getServer().adminWsClient().get("api/tests/list", "testFileKey", "sample-with-tests:src/test/xoo/sample/SampleTest.xoo");
-    JSONAssert.assertEquals(IOUtils.toString(this.getClass().getResourceAsStream("/testing/suite/TestExecutionTest/expected.json"), "UTF-8"), json, false);
+    JSONAssert.assertEquals(IOUtils.toString(this.getClass().getResourceAsStream("/test/TestExecutionTest/expected.json"), "UTF-8"), json, false);
   }
 }
diff --git a/it/it-tests/src/test/java/updatecenter/UpdateCenterTest.java b/it/it-tests/src/test/java/it/updateCenter/UpdateCenterTest.java
index 790883b9e34..ad9ab10cc3e 100644
--- a/it/it-tests/src/test/java/updatecenter/UpdateCenterTest.java
+++ b/it/it-tests/src/test/java/it/updateCenter/UpdateCenterTest.java
@@ -3,12 +3,14 @@
  * All rights reserved
  * mailto:contact AT sonarsource DOT com
  */
-package updatecenter;
+package it.updateCenter;
 
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.selenium.Selenese;
 import java.util.List;
 import org.apache.commons.lang.StringUtils;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.sonar.wsclient.services.Plugin;
@@ -17,12 +19,16 @@ import util.selenium.SeleneseTest;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static util.ItUtils.pluginArtifact;
+import static util.ItUtils.xooPlugin;
 
+/**
+ * This class start its own orchestrator
+ */
 public class UpdateCenterTest {
 
   @ClassRule
-  public static Orchestrator orchestrator = Orchestrator.builderEnv()
-    .setServerProperty("sonar.updatecenter.url", UpdateCenterTest.class.getResource("UpdateCenterTest/update-center.properties").toString())
+  public static final Orchestrator orchestrator = Orchestrator.builderEnv()
+    .setServerProperty("sonar.updatecenter.url", UpdateCenterTest.class.getResource("/updateCenter/UpdateCenterTest/update-center.properties").toString())
     .addPlugin(pluginArtifact("sonar-fake-plugin"))
     .build();
 
@@ -41,7 +47,7 @@ public class UpdateCenterTest {
   @Test
   public void test_console() {
     Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("server-update-center",
-      "/updatecenter/installed-plugins.html")
+      "/updateCenter/installed-plugins.html")
       .build();
     new SeleneseTest(selenese).runOn(orchestrator);
   }
diff --git a/it/it-tests/src/test/java/server/suite/WebServiceTest.java b/it/it-tests/src/test/java/it/user/FavouriteTest.java
index cd812ad07a6..c2fd6988040 100644
--- a/it/it-tests/src/test/java/server/suite/WebServiceTest.java
+++ b/it/it-tests/src/test/java/it/user/FavouriteTest.java
@@ -1,23 +1,34 @@
 /*
- * Copyright (C) 2009-2014 SonarSource SA
- * All rights reserved
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
  * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package server.suite;
+
+package it.user;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Iterables;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarRunner;
-import java.io.IOException;
+import com.sonar.orchestrator.locator.FileLocation;
+import it.Category4Suite;
 import java.util.List;
-import org.apache.commons.io.IOUtils;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.util.EntityUtils;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.sonar.wsclient.Sonar;
@@ -29,11 +40,15 @@ import org.sonar.wsclient.services.FavouriteQuery;
 import static com.google.common.collect.Lists.newArrayList;
 import static org.assertj.core.api.Assertions.assertThat;
 import static util.ItUtils.projectDir;
+import static util.ItUtils.runProjectAnalysis;
 
-public class WebServiceTest {
+/**
+ * TODO This test should not require an analysis, only provionning the project should be enough
+ */
+public class FavouriteTest {
 
   @ClassRule
-  public static final Orchestrator orchestrator = ServerTestSuite.ORCHESTRATOR;
+  public static final Orchestrator orchestrator = Category4Suite.ORCHESTRATOR;
 
   @Before
   public void inspectProject() {
@@ -73,29 +88,4 @@ public class WebServiceTest {
     assertThat(favourites.get(0).getKey()).isEqualTo("sample:src/main/xoo/sample/Sample.xoo");
   }
 
-  /**
-   * SONAR-3105
-   */
-  @Test
-  public void projects_web_service() throws IOException {
-    SonarRunner build = SonarRunner.create(projectDir("shared/xoo-sample"));
-    orchestrator.executeBuild(build);
-
-    String url = orchestrator.getServer().getUrl() + "/api/projects?key=sample&versions=true";
-    HttpClient httpclient = new DefaultHttpClient();
-    try {
-      HttpGet get = new HttpGet(url);
-      HttpResponse response = httpclient.execute(get);
-
-      assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
-      String content = IOUtils.toString(response.getEntity().getContent());
-      assertThat(content).doesNotContain("error");
-      assertThat(content).contains("sample");
-      EntityUtils.consume(response.getEntity());
-
-    } finally {
-      httpclient.getConnectionManager().shutdown();
-    }
-  }
-
 }
diff --git a/it/it-tests/src/test/java/it/user/ForceAuthenticationTest.java b/it/it-tests/src/test/java/it/user/ForceAuthenticationTest.java
new file mode 100644
index 00000000000..3ba20d21efd
--- /dev/null
+++ b/it/it-tests/src/test/java/it/user/ForceAuthenticationTest.java
@@ -0,0 +1,88 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+
+package it.user;
+
+import com.sonar.orchestrator.Orchestrator;
+import it.Category4Suite;
+import java.io.IOException;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.HttpClient;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.util.EntityUtils;
+import org.junit.ClassRule;
+import org.junit.Test;
+import org.sonar.wsclient.base.HttpException;
+import org.sonar.wsclient.services.PropertyDeleteQuery;
+import org.sonar.wsclient.services.PropertyUpdateQuery;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ForceAuthenticationTest {
+
+  @ClassRule
+  public static final Orchestrator orchestrator = Category4Suite.ORCHESTRATOR;
+
+  /**
+   * SONAR-5542
+   */
+  @Test
+  public void force_authentication_should_be_used_on_java_web_services_but_not_on_batch_index_and_file() throws IOException {
+    try {
+      orchestrator.getServer().getAdminWsClient().update(new PropertyUpdateQuery("sonar.forceAuthentication", "true"));
+
+      // /batch/index should never need authentication
+      String batchIndex = orchestrator.getServer().wsClient().get("/batch/index");
+      assertThat(batchIndex).isNotEmpty();
+
+      String jar = batchIndex.split("\\|")[0];
+
+      // /batch/file should never need authentication
+      HttpClient httpclient = new DefaultHttpClient();
+      try {
+        HttpGet get = new HttpGet(orchestrator.getServer().getUrl() + "/batch/file?name=" + jar);
+        HttpResponse response = httpclient.execute(get);
+        assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
+        EntityUtils.consume(response.getEntity());
+
+        // As Sonar runner is still using /batch/key, we have to also verify it
+        get = new HttpGet(orchestrator.getServer().getUrl() + "/batch/" + jar);
+        response = httpclient.execute(get);
+        assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
+        EntityUtils.consume(response.getEntity());
+
+      } finally {
+        httpclient.getConnectionManager().shutdown();
+      }
+
+      // but other java web services should need authentication
+      try {
+        orchestrator.getServer().wsClient().get("/api");
+      } catch (HttpException e) {
+        assertThat(e.getMessage()).contains("401");
+      }
+
+    } finally {
+      orchestrator.getServer().getAdminWsClient().delete(new PropertyDeleteQuery("sonar.forceAuthentication"));
+    }
+  }
+
+}
diff --git a/it/it-tests/src/test/java/server/ServerTest.java b/it/it-tests/src/test/java/server/ServerTest.java
deleted file mode 100644
index 9c4bc971939..00000000000
--- a/it/it-tests/src/test/java/server/ServerTest.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Copyright (C) 2009-2014 SonarSource SA
- * All rights reserved
- * mailto:contact AT sonarsource DOT com
- */
-package server;
-
-import com.sonar.orchestrator.Orchestrator;
-import com.sonar.orchestrator.build.SonarRunner;
-import com.sonar.orchestrator.locator.FileLocation;
-import com.sonar.orchestrator.selenium.Selenese;
-import java.io.File;
-import java.net.URL;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.SystemUtils;
-import org.junit.After;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.sonar.wsclient.services.Server;
-import org.sonar.wsclient.services.ServerQuery;
-import util.ItUtils;
-import util.selenium.SeleneseTest;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.Assert.fail;
-
-public class ServerTest {
-
-  Orchestrator orchestrator;
-
-  @Rule
-  public ExpectedException thrown = ExpectedException.none();
-
-  @After
-  public void stop() {
-    if (orchestrator != null) {
-      orchestrator.stop();
-    }
-  }
-
-  @Test
-  public void test_settings() {
-    URL secretKeyUrl = getClass().getResource("/server/ServerTest/sonar-secret.txt");
-    orchestrator = Orchestrator.builderEnv()
-      .addPlugin(ItUtils.pluginArtifact("settings-plugin"))
-      .addPlugin(ItUtils.pluginArtifact("license-plugin"))
-      .setServerProperty("sonar.secretKeyPath", secretKeyUrl.getFile())
-      .build();
-    orchestrator.start();
-
-    Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("settings",
-      "/server/ServerTest/settings/general-settings.html",
-
-      // SONAR-2869 the annotation @Properties can be used on extensions and not only on plugin entry points
-      "/server/ServerTest/settings/hidden-extension-property.html",
-      "/server/ServerTest/settings/global-extension-property.html",
-
-      // SONAR-3344 - licenses
-      "/server/ServerTest/settings/ignore-corrupted-license.html",
-      "/server/ServerTest/settings/display-license.html",
-      "/server/ServerTest/settings/display-untyped-license.html",
-
-      // SONAR-2084 - encryption
-      "/server/ServerTest/settings/generate-secret-key.html",
-      "/server/ServerTest/settings/encrypt-text.html",
-
-      // SONAR-1378 - property types
-      "/server/ServerTest/settings/validate-property-type.html",
-
-      // SONAR-3127 - hide passwords
-      "/server/ServerTest/settings/hide-passwords.html"
-      ).build();
-    new SeleneseTest(selenese).runOn(orchestrator);
-  }
-
-  @Test
-  public void property_relocation() {
-    orchestrator = Orchestrator.builderEnv()
-      .addPlugin(ItUtils.pluginArtifact("property-relocation-plugin"))
-      .addPlugin(ItUtils.xooPlugin())
-      .setServerProperty("sonar.deprecatedKey", "true")
-      .build();
-    orchestrator.start();
-
-    SonarRunner withDeprecatedKey = SonarRunner.create(ItUtils.projectDir("shared/xoo-sample"))
-      .setProperty("sonar.deprecatedKey", "true");
-    SonarRunner withNewKey = SonarRunner.create(ItUtils.projectDir("shared/xoo-sample"))
-      .setProperty("sonar.newKey", "true");
-    // should not fail
-    orchestrator.executeBuilds(withDeprecatedKey, withNewKey);
-
-    Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("property_relocation",
-      "/server/ServerTest/settings/property_relocation.html"
-      ).build();
-    new SeleneseTest(selenese).runOn(orchestrator);
-  }
-
-  /**
-   * SONAR-3516
-   */
-  @Test
-  public void check_minimal_sonar_version_at_startup() throws Exception {
-    try {
-      orchestrator = Orchestrator.builderEnv()
-        .addPlugin(FileLocation.of(new File(ServerTest.class.getResource("/server/ServerTest/incompatible-plugin-1.0.jar").toURI())))
-        .build();
-      orchestrator.start();
-      fail();
-    } catch (Exception e) {
-      assertThat(FileUtils.readFileToString(orchestrator.getServer().getLogs())).contains(
-        "Plugin incompatible-plugin [incompatibleplugin] requires at least SonarQube 5.9");
-    }
-  }
-
-  @Test
-  public void support_install_dir_with_whitespaces() throws Exception {
-    String dirName = "target/has space";
-    FileUtils.deleteDirectory(new File(dirName));
-    orchestrator = Orchestrator.builderEnv()
-        .setOrchestratorProperty("orchestrator.workspaceDir", dirName)
-        .build();
-    orchestrator.start();
-
-    Server.Status status = orchestrator.getServer().getAdminWsClient().find(new ServerQuery()).getStatus();
-    assertThat(status).isEqualTo(Server.Status.UP);
-  }
-
-  // SONAR-4748
-  @Test
-  public void should_create_in_temp_folder() throws Exception {
-    orchestrator = Orchestrator.builderEnv()
-      .addPlugin(ItUtils.pluginArtifact("server-plugin"))
-      .setServerProperty("sonar.createTempFiles", "true")
-      .build();
-    orchestrator.start();
-
-    File tempDir = new File(orchestrator.getServer().getHome(), "temp/tmp");
-
-    String logs = FileUtils.readFileToString(orchestrator.getServer().getLogs());
-    assertThat(logs).contains("Creating temp directory: " + tempDir.getAbsolutePath() + File.separator + "sonar-it");
-    assertThat(logs).contains("Creating temp file: " + tempDir.getAbsolutePath() + File.separator + "sonar-it");
-
-    // Verify temp folder is created
-    assertThat(new File(tempDir, "sonar-it")).isDirectory().exists();
-
-    orchestrator.stop();
-
-    // Verify temp folder is deleted after shutdown
-    assertThat(new File(tempDir, "sonar-it")).doesNotExist();
-  }
-
-  /**
-   * SONAR-4843
-   */
-  @Test
-  public void restart_forbidden_if_not_dev_mode() throws Exception {
-    // server classloader locks Jar files on Windows
-    if (!SystemUtils.IS_OS_WINDOWS) {
-      orchestrator = Orchestrator.builderEnv()
-        .build();
-      orchestrator.start();
-      try {
-        orchestrator.getServer().adminWsClient().systemClient().restart();
-        fail();
-      } catch (Exception e) {
-        assertThat(e.getMessage()).contains("403");
-      }
-    }
-  }
-
-  /**
-   * SONAR-4843
-   */
-  @Test
-  public void restart_on_dev_mode() throws Exception {
-    // server classloader locks Jar files on Windows
-    if (!SystemUtils.IS_OS_WINDOWS) {
-      orchestrator = Orchestrator.builderEnv()
-        .setServerProperty("sonar.web.dev", "true")
-        .build();
-      orchestrator.start();
-
-      orchestrator.getServer().adminWsClient().systemClient().restart();
-      assertThat(FileUtils.readFileToString(orchestrator.getServer().getLogs()))
-        .contains("Restart server")
-        .contains("Server restarted");
-    }
-  }
-}
diff --git a/it/it-tests/src/test/java/server/suite/ServerTest.java b/it/it-tests/src/test/java/server/suite/ServerTest.java
deleted file mode 100644
index 27a2aeab267..00000000000
--- a/it/it-tests/src/test/java/server/suite/ServerTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2009-2014 SonarSource SA
- * All rights reserved
- * mailto:contact AT sonarsource DOT com
- */
-package server.suite;
-
-import com.sonar.orchestrator.Orchestrator;
-import com.sonar.orchestrator.build.SonarRunner;
-import com.sonar.orchestrator.selenium.Selenese;
-import java.io.IOException;
-import org.apache.commons.io.FileUtils;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.util.EntityUtils;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.sonar.wsclient.base.HttpException;
-import org.sonar.wsclient.services.PropertyDeleteQuery;
-import org.sonar.wsclient.services.PropertyUpdateQuery;
-import util.ItUtils;
-import util.selenium.SeleneseTest;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class ServerTest {
-
-  @ClassRule
-  public static final Orchestrator orchestrator = ServerTestSuite.ORCHESTRATOR;
-
-  @Rule
-  public ExpectedException thrown = ExpectedException.none();
-
-  @Before
-  public void cleanDatabase() {
-    orchestrator.resetData();
-  }
-
-  /**
-   * See http://jira.codehaus.org/browse/SONAR-2727
-   */
-  @Test
-  public void display_warnings_when_using_h2() {
-    if (orchestrator.getConfiguration().getString("sonar.jdbc.dialect").equals("h2")) {
-      Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("derby-warnings",
-        "/server/ServerTest/derby-warning.html").build();
-      new SeleneseTest(selenese).runOn(orchestrator);
-    }
-  }
-
-  /**
-   * See http://jira.codehaus.org/browse/SONAR-2840
-   */
-  @Test
-  public void hide_jdbc_settings_to_non_admin() {
-    Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("jdbc-settings",
-      "/server/ServerTest/hide-jdbc-settings.html").build();
-    new SeleneseTest(selenese).runOn(orchestrator);
-  }
-
-  /**
-   * SONAR-5542
-   */
-  @Test
-  public void force_authentication_should_be_used_on_java_web_services_but_not_on_batch_index_and_file() throws IOException {
-    try {
-      orchestrator.getServer().getAdminWsClient().update(new PropertyUpdateQuery("sonar.forceAuthentication", "true"));
-
-      // /batch/index should never need authentication
-      String batchIndex = orchestrator.getServer().wsClient().get("/batch/index");
-      assertThat(batchIndex).isNotEmpty();
-
-      String jar = batchIndex.split("\\|")[0];
-
-      // /batch/file should never need authentication
-      HttpClient httpclient = new DefaultHttpClient();
-      try {
-        HttpGet get = new HttpGet(orchestrator.getServer().getUrl() + "/batch/file?name=" + jar);
-        HttpResponse response = httpclient.execute(get);
-        assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
-        EntityUtils.consume(response.getEntity());
-
-        // As Sonar runner is still using /batch/key, we have to also verify it
-        get = new HttpGet(orchestrator.getServer().getUrl() + "/batch/" + jar);
-        response = httpclient.execute(get);
-        assertThat(response.getStatusLine().getStatusCode()).isEqualTo(200);
-        EntityUtils.consume(response.getEntity());
-
-      } finally {
-        httpclient.getConnectionManager().shutdown();
-      }
-
-      // but other java web services should need authentication
-      try {
-        orchestrator.getServer().wsClient().get("/api");
-      } catch (HttpException e) {
-        assertThat(e.getMessage()).contains("401");
-      }
-
-    } finally {
-      orchestrator.getServer().getAdminWsClient().delete(new PropertyDeleteQuery("sonar.forceAuthentication"));
-    }
-  }
-
-  /**
-   * SONAR-3320
-   */
-  @Test
-  public void global_property_change_extension_point() throws IOException {
-    orchestrator.getServer().adminWsClient().post("api/properties/create?id=globalPropertyChange.received&value=NEWVALUE");
-    assertThat(FileUtils.readFileToString(orchestrator.getServer().getLogs()).contains("Received change: NEWVALUE"));
-  }
-
-  /**
-   * SONAR-3962
-   */
-  @Test
-  public void not_fail_with_url_ending_by_jsp() {
-    orchestrator.executeBuild(SonarRunner.create(ItUtils.projectDir("shared/xoo-sample"))
-      .setProperty("sonar.projectKey", "myproject.jsp"));
-    // Access dashboard
-    Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("url_ending_by_jsp",
-      "/server/ServerTest/url_ending_by_jsp.html").build();
-    new SeleneseTest(selenese).runOn(orchestrator);
-  }
-
-  // SONAR-4404
-  @Test
-  public void should_get_settings_default_value() {
-    Selenese selenese = Selenese.builder().setHtmlTestsInClasspath("settings-default-value",
-      "/server/ServerTest/settings-default-value.html").build();
-    new SeleneseTest(selenese).runOn(orchestrator);
-  }
-
-}
diff --git a/it/it-tests/src/test/java/server/suite/ServerTestSuite.java b/it/it-tests/src/test/java/server/suite/ServerTestSuite.java
deleted file mode 100644
index dd5897799cc..00000000000
--- a/it/it-tests/src/test/java/server/suite/ServerTestSuite.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * SonarQube, open source software quality management tool.
- * Copyright (C) 2008-2014 SonarSource
- * mailto:contact AT sonarsource DOT com
- *
- * SonarQube is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * SonarQube is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-package server.suite;
-
-import com.sonar.orchestrator.Orchestrator;
-import org.junit.ClassRule;
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import util.ItUtils;
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses({
-  ServerAdministrationTest.class,
-  WebServiceTest.class,
-  ServerTest.class
-})
-public class ServerTestSuite {
-
-  @ClassRule
-  public static final Orchestrator ORCHESTRATOR = Orchestrator.builderEnv()
-    .addPlugin(ItUtils.xooPlugin())
-
-    // Used in global_property_change_extension_point
-    .addPlugin(ItUtils.pluginArtifact("global-property-change-plugin"))
-
-    // Used in should_get_settings_default_value
-    .addPlugin(ItUtils.pluginArtifact("server-plugin"))
-
-    .build();
-}
diff --git a/it/it-tests/src/test/resources/administration/suite/BulkDeletionTest/project-bulk-deletion/bulk-delete-selected-projects.html b/it/it-tests/src/test/resources/administration/suite/BulkDeletionTest/project-bulk-deletion/bulk-delete-selected-projects.html
deleted file mode 100644
index 7662c60c5de..00000000000
--- a/it/it-tests/src/test/resources/administration/suite/BulkDeletionTest/project-bulk-deletion/bulk-delete-selected-projects.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <title>bulk-delete-selected-projects</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-    <tbody>
-    <tr>
-        <td>open</td>
-        <td>/sonar/sessions/logout</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>open</td>
-        <td>/sonar/sessions/login</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>login</td>
-        <td>admin</td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>password</td>
-        <td>admin</td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>commit</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>open</td>
-        <td>/sonar/bulk_deletion</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertText</td>
-        <td>content</td>
-        <td>*Bar-Sonar-Plugin*Foo-Application*Sample-Project*</td>
-    </tr>
-    <tr>
-        <td>click</td>
-        <td>id=r-0</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>click</td>
-        <td>id=r-2</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>id=delete_resources</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertConfirmation</td>
-        <td>Are you sure you want to delete the selected resources?</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>pause</td>
-        <td>12000</td>
-        <td>NOTE: necessary as the deletion is asynchronous</td>
-    </tr>
-    <tr>
-        <td>assertElementNotPresent</td>
-        <td>id=r-1</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertText</td>
-        <td>content</td>
-        <td>*Foo-Application*</td>
-    </tr>
-    <tr>
-        <td>assertTextNotPresent</td>
-        <td>content</td>
-        <td>*Bar-Sonar-Plugin*Sample-Project*</td>
-    </tr>
-    </tbody>
-</table>
-</body>
-</html>
diff --git a/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/display-alerts-history-page/should-display-alerts-correctly-history-page.html b/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/display-alerts-history-page/should-display-alerts-correctly-history-page.html
deleted file mode 100644
index 4dc4d198472..00000000000
--- a/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/display-alerts-history-page/should-display-alerts-correctly-history-page.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <title>should-display-alerts-correctly-history-page</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-    <thead>
-    <tr>
-        <td rowspan="1" colspan="3">should-display-alerts-correctly-history-page</td>
-    </tr>
-    </thead>
-    <tbody>
-    <tr>
-        <td>open</td>
-        <td>/sonar/sessions/login</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>login</td>
-        <td>admin</td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>password</td>
-        <td>admin</td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>commit</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>open</td>
-        <td>/sonar/dashboard/index/sample</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>click</td>
-        <td>css=#context-navigation .navbar-admin-link</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>waitForElementPresent</td>
-        <td>link=History</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>link=History</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertElementPresent</td>
-        <td>//img[@title='Quality Gate Status: Green (was Orange). ']</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertElementPresent</td>
-        <td>//img[@title='Quality Gate Status: Orange. Lines > 5']</td>
-        <td></td>
-    </tr>
-    </tbody>
-</table>
-</body>
-</html>
diff --git a/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-no-input.html b/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-no-input.html
deleted file mode 100644
index e160f298142..00000000000
--- a/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-no-input.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <title>bulk-update-impossible-because-no-input</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-    <tbody>
-    <tr>
-        <td>open</td>
-        <td>/sonar/sessions/logout</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>open</td>
-        <td>/sonar/sessions/login</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>login</td>
-        <td>admin</td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>password</td>
-        <td>admin</td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>commit</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>open</td>
-        <td>/sonar/dashboard/index/com.sonarsource.it.samples:multi-modules-sample</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>click</td>
-        <td>css=#context-navigation .navbar-admin-link</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>waitForElementPresent</td>
-        <td>link=Update Key</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>link=Update Key</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>id=bulk_update_button</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertText</td>
-        <td>content</td>
-        <td>*The two fields can not be blank for the bulk update.*</td>
-    </tr>
-    </tbody>
-</table>
-</body>
-</html>
diff --git a/it/it-tests/src/test/resources/administration/suite/PropertySetsTest/property-sets/all_types.html b/it/it-tests/src/test/resources/administration/suite/PropertySetsTest/property-sets/all_types.html
deleted file mode 100644
index e12fac9d324..00000000000
--- a/it/it-tests/src/test/resources/administration/suite/PropertySetsTest/property-sets/all_types.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <title>all_types</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-    <tbody>
-    <tr>
-        <td>open</td>
-        <td>/sonar/sessions/new</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>login</td>
-        <td>admin</td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>password</td>
-        <td>admin</td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>commit</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>open</td>
-        <td>/sonar/settings?category=DEV</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>waitForValue</td>
-        <td>name=page_version</td>
-        <td>1</td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>id=input_text</td>
-        <td>text</td>
-    </tr>
-    <tr>
-        <td>select</td>
-        <td>id=input_boolean</td>
-        <td>label=True</td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>id=input_float</td>
-        <td>42.0</td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>id=input_license</td>
-        <td>abc</td>
-    </tr>
-    <tr>
-        <td>select</td>
-        <td>id=input_metric</td>
-        <td>label=Overall condition coverage</td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>id=input_password</td>
-        <td>abcde</td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>id=input_regexp</td>
-        <td>.*</td>
-    </tr>
-    <tr>
-        <td>select</td>
-        <td>id=input_list</td>
-        <td>label=AAA</td>
-    </tr>
-    <tr>
-        <td>click</td>
-        <td>id=submit_settings</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>waitForValue</td>
-        <td>name=page_version</td>
-        <td>2</td>
-    </tr>
-    <tr>
-        <td>assertValue</td>
-        <td>id=input_text</td>
-        <td>text</td>
-    </tr>
-    <tr>
-        <td>assertValue</td>
-        <td>id=input_boolean</td>
-        <td>true</td>
-    </tr>
-    <tr>
-        <td>assertValue</td>
-        <td>id=input_float</td>
-        <td>42.0</td>
-    </tr>
-    <tr>
-        <td>assertValue</td>
-        <td>id=input_license</td>
-        <td>abc</td>
-    </tr>
-    <tr>
-        <td>assertValue</td>
-        <td>id=input_metric</td>
-        <td>overall_branch_coverage</td>
-    </tr>
-    <tr>
-        <td>assertValue</td>
-        <td>id=input_password</td>
-        <td>{{*******************}}</td>
-    </tr>
-    <tr>
-        <td>assertValue</td>
-        <td>id=input_regexp</td>
-        <td>exact:.*</td>
-    </tr>
-    <tr>
-        <td>assertValue</td>
-        <td>id=input_list</td>
-        <td>AAA</td>
-    </tr>
-    </tbody>
-</table>
-</body>
-</html>
diff --git a/it/it-tests/src/test/resources/batch/BatchTest/one-issue-per-line.xml b/it/it-tests/src/test/resources/analysis/BatchTest/one-issue-per-line.xml
index 7bb4ed5593a..7bb4ed5593a 100644
--- a/it/it-tests/src/test/resources/batch/BatchTest/one-issue-per-line.xml
+++ b/it/it-tests/src/test/resources/analysis/BatchTest/one-issue-per-line.xml
diff --git a/it/it-tests/src/test/resources/batch/IssueJsonReportTest/no-server-analysis.json b/it/it-tests/src/test/resources/analysis/IssueJsonReportTest/no-server-analysis.json
index 3b632a14ba0..3b632a14ba0 100644
--- a/it/it-tests/src/test/resources/batch/IssueJsonReportTest/no-server-analysis.json
+++ b/it/it-tests/src/test/resources/analysis/IssueJsonReportTest/no-server-analysis.json
diff --git a/it/it-tests/src/test/resources/batch/IssueJsonReportTest/one-issue-per-line.xml b/it/it-tests/src/test/resources/analysis/IssueJsonReportTest/one-issue-per-line.xml
index 7bb4ed5593a..7bb4ed5593a 100644
--- a/it/it-tests/src/test/resources/batch/IssueJsonReportTest/one-issue-per-line.xml
+++ b/it/it-tests/src/test/resources/analysis/IssueJsonReportTest/one-issue-per-line.xml
diff --git a/it/it-tests/src/test/resources/batch/IssueJsonReportTest/report-on-root-module.json b/it/it-tests/src/test/resources/analysis/IssueJsonReportTest/report-on-root-module.json
index 53d0bc52c20..53d0bc52c20 100644
--- a/it/it-tests/src/test/resources/batch/IssueJsonReportTest/report-on-root-module.json
+++ b/it/it-tests/src/test/resources/analysis/IssueJsonReportTest/report-on-root-module.json
diff --git a/it/it-tests/src/test/resources/batch/IssueJsonReportTest/report-on-single-module-branch.json b/it/it-tests/src/test/resources/analysis/IssueJsonReportTest/report-on-single-module-branch.json
index a7673ec603f..a7673ec603f 100644
--- a/it/it-tests/src/test/resources/batch/IssueJsonReportTest/report-on-single-module-branch.json
+++ b/it/it-tests/src/test/resources/analysis/IssueJsonReportTest/report-on-single-module-branch.json
diff --git a/it/it-tests/src/test/resources/analysis/IssueJsonReportTest/report-on-single-module.json b/it/it-tests/src/test/resources/analysis/IssueJsonReportTest/report-on-single-module.json
new file mode 100644
index 00000000000..47b244bd383
--- /dev/null
+++ b/it/it-tests/src/test/resources/analysis/IssueJsonReportTest/report-on-single-module.json
@@ -0,0 +1,195 @@
+{
+  "version": "<SONAR_VERSION>",
+  "issues": [
+    {
+      "key": "<ISSUE_KEY>",
+      "component": "sample:src/main/xoo/sample/Sample.xoo",
+      "line": 6,
+      "message": "This issue is generated on each line",
+      "severity": "MAJOR",
+      "rule": "xoo:OneIssuePerLine",
+      "status": "OPEN",
+      "isNew": false,
+      "creationDate": "2013-05-01T00:00:00+0200"
+    },
+    {
+      "key": "<ISSUE_KEY>",
+      "component": "sample:src/main/xoo/sample/Sample.xoo",
+      "line": 5,
+      "message": "This issue is generated on each line",
+      "severity": "MAJOR",
+      "rule": "xoo:OneIssuePerLine",
+      "status": "OPEN",
+      "isNew": false,
+      "creationDate": "2013-05-01T00:00:00+0200"
+    },
+    {
+      "key": "<ISSUE_KEY>",
+      "component": "sample:src/main/xoo/sample/Sample.xoo",
+      "line": 13,
+      "message": "This issue is generated on each line",
+      "severity": "MAJOR",
+      "rule": "xoo:OneIssuePerLine",
+      "status": "OPEN",
+      "isNew": false,
+      "creationDate": "2013-05-01T00:00:00+0200"
+    },
+    {
+      "key": "<ISSUE_KEY>",
+      "component": "sample:src/main/xoo/sample/Sample.xoo",
+      "line": 1,
+      "message": "This issue is generated on each line",
+      "severity": "MAJOR",
+      "rule": "xoo:OneIssuePerLine",
+      "status": "OPEN",
+      "isNew": false,
+      "creationDate": "2013-05-01T00:00:00+0200"
+    },
+    {
+      "key": "<ISSUE_KEY>",
+      "component": "sample:src/main/xoo/sample/Sample.xoo",
+      "line": 3,
+      "message": "This issue is generated on each line",
+      "severity": "MAJOR",
+      "rule": "xoo:OneIssuePerLine",
+      "status": "OPEN",
+      "isNew": false,
+      "creationDate": "2013-05-01T00:00:00+0200"
+    },
+    {
+      "key": "<ISSUE_KEY>",
+      "component": "sample:src/main/xoo/sample/Sample.xoo",
+      "line": 4,
+      "message": "This issue is generated on each line",
+      "severity": "MAJOR",
+      "rule": "xoo:OneIssuePerLine",
+      "status": "OPEN",
+      "isNew": false,
+      "creationDate": "2013-05-01T00:00:00+0200"
+    },
+    {
+      "key": "<ISSUE_KEY>",
+      "component": "sample:src/main/xoo/sample/Sample.xoo",
+      "line": 12,
+      "message": "This issue is generated on each line",
+      "severity": "MAJOR",
+      "rule": "xoo:OneIssuePerLine",
+      "status": "OPEN",
+      "isNew": false,
+      "creationDate": "2013-05-01T00:00:00+0200"
+    },
+    {
+      "key": "<ISSUE_KEY>",
+      "component": "sample:src/main/xoo/sample/Sample.xoo",
+      "line": 10,
+      "message": "This issue is generated on each line",
+      "severity": "MAJOR",
+      "rule": "xoo:OneIssuePerLine",
+      "status": "OPEN",
+      "isNew": false,
+      "creationDate": "2013-05-01T00:00:00+0200"
+    },
+    {
+      "key": "<ISSUE_KEY>",
+      "component": "sample:src/main/xoo/sample/Sample.xoo",
+      "line": 2,
+      "message": "This issue is generated on each line",
+      "severity": "MAJOR",
+      "rule": "xoo:OneIssuePerLine",
+      "status": "OPEN",
+      "isNew": false,
+      "creationDate": "2013-05-01T00:00:00+0200"
+    },
+    {
+      "key": "<ISSUE_KEY>",
+      "component": "sample:src/main/xoo/sample/Sample.xoo",
+      "line": 9,
+      "message": "This issue is generated on each line",
+      "severity": "MAJOR",
+      "rule": "xoo:OneIssuePerLine",
+      "status": "OPEN",
+      "isNew": false,
+      "creationDate": "2013-05-01T00:00:00+0200"
+    },
+    {
+      "key": "<ISSUE_KEY>",
+      "component": "sample:src/main/xoo/sample/Sample.xoo",
+      "line": 11,
+      "message": "This issue is generated on each line",
+      "severity": "MAJOR",
+      "rule": "xoo:OneIssuePerLine",
+      "status": "OPEN",
+      "isNew": true,
+      "creationDate": "2013-05-02T00:00:00+0200"
+    },
+    {
+      "key": "<ISSUE_KEY>",
+      "component": "sample:src/main/xoo/sample/Sample.xoo",
+      "line": 7,
+      "message": "This issue is generated on each line",
+      "severity": "MAJOR",
+      "rule": "xoo:OneIssuePerLine",
+      "status": "OPEN",
+      "isNew": true,
+      "creationDate": "2013-05-02T00:00:00+0200"
+    },
+    {
+      "key": "<ISSUE_KEY>",
+      "component": "sample:src/main/xoo/sample/Sample.xoo",
+      "line": 8,
+      "message": "This issue is generated on each line",
+      "severity": "MAJOR",
+      "rule": "xoo:OneIssuePerLine",
+      "status": "OPEN",
+      "isNew": false,
+      "creationDate": "2013-05-01T00:00:00+0200"
+    },
+    {
+      "key": "<ISSUE_KEY>",
+      "component": "sample:src/main/xoo/sample/Sample.xoo",
+      "line": 14,
+      "message": "This issue is generated on each line",
+      "severity": "MAJOR",
+      "rule": "xoo:OneIssuePerLine",
+      "status": "OPEN",
+      "isNew": false,
+      "creationDate": "2013-05-01T00:00:00+0200"
+    },
+    {
+      "key": "<ISSUE_KEY>",
+      "component": "sample:src/main/xoo/sample/Sample.xoo",
+      "line": 15,
+      "message": "This issue is generated on each line",
+      "severity": "MAJOR",
+      "rule": "xoo:OneIssuePerLine",
+      "status": "OPEN",
+      "isNew": false,
+      "creationDate": "2013-05-01T00:00:00+0200"
+    }
+  ],
+  "components": [
+    {
+      "key": "sample"
+    },
+    {
+      "key": "sample:src/main/xoo/sample",
+      "path": "src/main/xoo/sample",
+      "moduleKey": "sample"
+    },
+    {
+      "key": "sample:src/main/xoo/sample/Sample.xoo",
+      "path": "src/main/xoo/sample/Sample.xoo",
+      "moduleKey": "sample",
+      "status": "CHANGED"
+    }
+  ],
+  "rules": [
+    {
+      "key": "xoo:OneIssuePerLine",
+      "rule": "OneIssuePerLine",
+      "repository": "xoo",
+      "name": "One Issue Per Line"
+    }
+  ],
+  "users": []
+}
diff --git a/it/it-tests/src/test/resources/batch/IssueJsonReportTest/report-on-sub-module.json b/it/it-tests/src/test/resources/analysis/IssueJsonReportTest/report-on-sub-module.json
index cc979a77420..cc979a77420 100644
--- a/it/it-tests/src/test/resources/batch/IssueJsonReportTest/report-on-sub-module.json
+++ b/it/it-tests/src/test/resources/analysis/IssueJsonReportTest/report-on-sub-module.json
diff --git a/it/it-tests/src/test/resources/batch/IssuesModeTest/empty.xml b/it/it-tests/src/test/resources/analysis/IssuesModeTest/empty.xml
index 8bab61d6c85..8bab61d6c85 100644
--- a/it/it-tests/src/test/resources/batch/IssuesModeTest/empty.xml
+++ b/it/it-tests/src/test/resources/analysis/IssuesModeTest/empty.xml
diff --git a/it/it-tests/src/test/resources/batch/IssuesModeTest/one-issue-per-line-empty.xml b/it/it-tests/src/test/resources/analysis/IssuesModeTest/one-issue-per-line-empty.xml
index 0ba34f10dbd..0ba34f10dbd 100644
--- a/it/it-tests/src/test/resources/batch/IssuesModeTest/one-issue-per-line-empty.xml
+++ b/it/it-tests/src/test/resources/analysis/IssuesModeTest/one-issue-per-line-empty.xml
diff --git a/it/it-tests/src/test/resources/batch/IssuesModeTest/one-issue-per-line.xml b/it/it-tests/src/test/resources/analysis/IssuesModeTest/one-issue-per-line.xml
index 7bb4ed5593a..7bb4ed5593a 100644
--- a/it/it-tests/src/test/resources/batch/IssuesModeTest/one-issue-per-line.xml
+++ b/it/it-tests/src/test/resources/analysis/IssuesModeTest/one-issue-per-line.xml
diff --git a/it/it-tests/src/test/resources/batch/IssuesModeTest/with-many-rules.xml b/it/it-tests/src/test/resources/analysis/IssuesModeTest/with-many-rules.xml
index f3d0baf0616..f3d0baf0616 100644
--- a/it/it-tests/src/test/resources/batch/IssuesModeTest/with-many-rules.xml
+++ b/it/it-tests/src/test/resources/analysis/IssuesModeTest/with-many-rules.xml
diff --git a/it/it-tests/src/test/resources/batch/MultiLanguageTest/one-issue-per-line-xoo2.xml b/it/it-tests/src/test/resources/analysis/MultiLanguageTest/one-issue-per-line-xoo2.xml
index 67215f91a52..67215f91a52 100644
--- a/it/it-tests/src/test/resources/batch/MultiLanguageTest/one-issue-per-line-xoo2.xml
+++ b/it/it-tests/src/test/resources/analysis/MultiLanguageTest/one-issue-per-line-xoo2.xml
diff --git a/it/it-tests/src/test/resources/batch/MultiLanguageTest/one-issue-per-line.xml b/it/it-tests/src/test/resources/analysis/MultiLanguageTest/one-issue-per-line.xml
index 7bb4ed5593a..7bb4ed5593a 100644
--- a/it/it-tests/src/test/resources/batch/MultiLanguageTest/one-issue-per-line.xml
+++ b/it/it-tests/src/test/resources/analysis/MultiLanguageTest/one-issue-per-line.xml
diff --git a/it/it-tests/src/test/resources/batch/SettingsEncryptionTest/sonar-secret.txt b/it/it-tests/src/test/resources/analysis/SettingsEncryptionTest/sonar-secret.txt
index 65b98c522da..65b98c522da 100644
--- a/it/it-tests/src/test/resources/batch/SettingsEncryptionTest/sonar-secret.txt
+++ b/it/it-tests/src/test/resources/analysis/SettingsEncryptionTest/sonar-secret.txt
diff --git a/it/it-tests/src/test/resources/batch/TempFolderTest/one-issue-per-line.xml b/it/it-tests/src/test/resources/analysis/TempFolderTest/one-issue-per-line.xml
index 7bb4ed5593a..7bb4ed5593a 100644
--- a/it/it-tests/src/test/resources/batch/TempFolderTest/one-issue-per-line.xml
+++ b/it/it-tests/src/test/resources/analysis/TempFolderTest/one-issue-per-line.xml
diff --git a/it/it-tests/src/test/resources/batch/IssueJsonReportTest/report-on-single-module.json b/it/it-tests/src/test/resources/batch/IssueJsonReportTest/report-on-single-module.json
deleted file mode 100644
index 4b42c103ace..00000000000
--- a/it/it-tests/src/test/resources/batch/IssueJsonReportTest/report-on-single-module.json
+++ /dev/null
@@ -1,196 +0,0 @@
-{
-    "version": "<SONAR_VERSION>",
-    "issues": [
-        {
-            "key": "<ISSUE_KEY>",
-            "component": "sample:src/main/xoo/sample/Sample.xoo",
-            "line": 6,
-            "message": "This issue is generated on each line",
-            "severity": "MAJOR",
-            "rule": "xoo:OneIssuePerLine",
-            "status": "OPEN",
-            "isNew": false,
-            "creationDate": "2013-05-01T00:00:00+0200"
-        },
-        {
-            "key": "<ISSUE_KEY>",
-            "component": "sample:src/main/xoo/sample/Sample.xoo",
-            "line": 5,
-            "message": "This issue is generated on each line",
-            "severity": "MAJOR",
-            "rule": "xoo:OneIssuePerLine",
-            "status": "OPEN",
-            "isNew": false,
-            "creationDate": "2013-05-01T00:00:00+0200"
-        },
-        {
-            "key": "<ISSUE_KEY>",
-            "component": "sample:src/main/xoo/sample/Sample.xoo",
-            "line": 13,
-            "message": "This issue is generated on each line",
-            "severity": "MAJOR",
-            "rule": "xoo:OneIssuePerLine",
-            "status": "OPEN",
-            "isNew": false,
-            "creationDate": "2013-05-01T00:00:00+0200"
-        },
-        {
-            "key": "<ISSUE_KEY>",
-            "component": "sample:src/main/xoo/sample/Sample.xoo",
-            "line": 1,
-            "message": "This issue is generated on each line",
-            "severity": "MAJOR",
-            "rule": "xoo:OneIssuePerLine",
-            "status": "OPEN",
-            "isNew": false,
-            "creationDate": "2013-05-01T00:00:00+0200"
-        },
-        {
-            "key": "<ISSUE_KEY>",
-            "component": "sample:src/main/xoo/sample/Sample.xoo",
-            "line": 3,
-            "message": "This issue is generated on each line",
-            "severity": "MAJOR",
-            "rule": "xoo:OneIssuePerLine",
-            "status": "OPEN",
-            "isNew": false,
-            "creationDate": "2013-05-01T00:00:00+0200"
-        },
-        {
-            "key": "<ISSUE_KEY>",
-            "component": "sample:src/main/xoo/sample/Sample.xoo",
-            "line": 4,
-            "message": "This issue is generated on each line",
-            "severity": "MAJOR",
-            "rule": "xoo:OneIssuePerLine",
-            "status": "OPEN",
-            "isNew": false,
-            "creationDate": "2013-05-01T00:00:00+0200"
-        },
-        {
-            "key": "<ISSUE_KEY>",
-            "component": "sample:src/main/xoo/sample/Sample.xoo",
-            "line": 12,
-            "message": "This issue is generated on each line",
-            "severity": "MAJOR",
-            "rule": "xoo:OneIssuePerLine",
-            "status": "OPEN",
-            "isNew": false,
-            "creationDate": "2013-05-01T00:00:00+0200"
-        },
-        {
-            "key": "<ISSUE_KEY>",
-            "component": "sample:src/main/xoo/sample/Sample.xoo",
-            "line": 10,
-            "message": "This issue is generated on each line",
-            "severity": "MAJOR",
-            "rule": "xoo:OneIssuePerLine",
-            "status": "OPEN",
-            "isNew": false,
-            "creationDate": "2013-05-01T00:00:00+0200"
-        },
-        {
-            "key": "<ISSUE_KEY>",
-            "component": "sample:src/main/xoo/sample/Sample.xoo",
-            "line": 2,
-            "message": "This issue is generated on each line",
-            "severity": "MAJOR",
-            "rule": "xoo:OneIssuePerLine",
-            "status": "OPEN",
-            "isNew": false,
-            "creationDate": "2013-05-01T00:00:00+0200"
-        },
-        {
-            "key": "<ISSUE_KEY>",
-            "component": "sample:src/main/xoo/sample/Sample.xoo",
-            "line": 9,
-            "message": "This issue is generated on each line",
-            "severity": "MAJOR",
-            "rule": "xoo:OneIssuePerLine",
-            "status": "OPEN",
-            "isNew": false,
-            "creationDate": "2013-05-01T00:00:00+0200"
-        },
-        {
-            "key": "<ISSUE_KEY>",
-            "component": "sample:src/main/xoo/sample/Sample.xoo",
-            "line": 11,
-            "message": "This issue is generated on each line",
-            "severity": "MAJOR",
-            "rule": "xoo:OneIssuePerLine",
-            "status": "OPEN",
-            "isNew": true,
-            "creationDate": "2013-05-02T00:00:00+0200"
-        },
-        {
-            "key": "<ISSUE_KEY>",
-            "component": "sample:src/main/xoo/sample/Sample.xoo",
-            "line": 7,
-            "message": "This issue is generated on each line",
-            "severity": "MAJOR",
-            "rule": "xoo:OneIssuePerLine",
-            "status": "OPEN",
-            "isNew": true,
-            "creationDate": "2013-05-02T00:00:00+0200"
-        },
-        {
-            "key": "<ISSUE_KEY>",
-            "component": "sample:src/main/xoo/sample/Sample.xoo",
-            "line": 8,
-            "message": "This issue is generated on each line",
-            "severity": "MAJOR",
-            "rule": "xoo:OneIssuePerLine",
-            "status": "OPEN",
-            "isNew": false,
-            "creationDate": "2013-05-01T00:00:00+0200"
-        },
-        {
-            "key": "<ISSUE_KEY>",
-            "component": "sample:src/main/xoo/sample/Sample.xoo",
-            "line": 14,
-            "message": "This issue is generated on each line",
-            "severity": "MAJOR",
-            "rule": "xoo:OneIssuePerLine",
-            "status": "OPEN",
-            "isNew": false,
-            "creationDate": "2013-05-01T00:00:00+0200"
-        },
-        {
-            "key": "<ISSUE_KEY>",
-            "component": "sample:src/main/xoo/sample/Sample.xoo",
-            "line": 15,
-            "message": "This issue is generated on each line",
-            "severity": "MAJOR",
-            "rule": "xoo:OneIssuePerLine",
-            "status": "OPEN",
-            "isNew": false,
-            "creationDate": "2013-05-01T00:00:00+0200"
-        }
-    ],
-    "components": [
-        {
-            "key": "sample"
-        },
-        {
-            "key": "sample:src/main/xoo/sample",
-            "path": "src/main/xoo/sample",
-            "moduleKey": "sample"
-        },
-        {
-            "key": "sample:src/main/xoo/sample/Sample.xoo",
-            "path": "src/main/xoo/sample/Sample.xoo",
-            "moduleKey": "sample",
-            "status": "CHANGED"
-        }
-    ],
-    "rules": [
-        {
-            "key": "xoo:OneIssuePerLine",
-            "rule": "OneIssuePerLine",
-            "repository": "xoo",
-            "name": "One Issue Per Line"
-        }
-    ],
-    "users": [ ]
-
-}
diff --git a/it/it-tests/src/test/resources/ui/i18n/default-locale-is-english.html b/it/it-tests/src/test/resources/i18n/default-locale-is-english.html
index f2e23f196a1..f2e23f196a1 100644
--- a/it/it-tests/src/test/resources/ui/i18n/default-locale-is-english.html
+++ b/it/it-tests/src/test/resources/i18n/default-locale-is-english.html
diff --git a/it/it-tests/src/test/resources/ui/i18n/french-locale.html b/it/it-tests/src/test/resources/i18n/french-locale.html
index 74f2f320a02..74f2f320a02 100644
--- a/it/it-tests/src/test/resources/ui/i18n/french-locale.html
+++ b/it/it-tests/src/test/resources/i18n/french-locale.html
diff --git a/it/it-tests/src/test/resources/ui/i18n/french-pack.html b/it/it-tests/src/test/resources/i18n/french-pack.html
index 6f3d925491f..6f3d925491f 100644
--- a/it/it-tests/src/test/resources/ui/i18n/french-pack.html
+++ b/it/it-tests/src/test/resources/i18n/french-pack.html
diff --git a/it/it-tests/src/test/resources/ui/i18n/locale-with-france-country.html b/it/it-tests/src/test/resources/i18n/locale-with-france-country.html
index e65cd5e95bf..e65cd5e95bf 100644
--- a/it/it-tests/src/test/resources/ui/i18n/locale-with-france-country.html
+++ b/it/it-tests/src/test/resources/i18n/locale-with-france-country.html
diff --git a/it/it-tests/src/test/resources/ui/i18n/locale-with-swiss-country.html b/it/it-tests/src/test/resources/i18n/locale-with-swiss-country.html
index 888f5d8f3a8..888f5d8f3a8 100644
--- a/it/it-tests/src/test/resources/ui/i18n/locale-with-swiss-country.html
+++ b/it/it-tests/src/test/resources/i18n/locale-with-swiss-country.html
diff --git a/it/it-tests/src/test/resources/issue/suite/CommonRulesTest/xoo-common-rules-profile.xml b/it/it-tests/src/test/resources/issue/CommonRulesTest/xoo-common-rules-profile.xml
index 9803527b94f..9803527b94f 100644
--- a/it/it-tests/src/test/resources/issue/suite/CommonRulesTest/xoo-common-rules-profile.xml
+++ b/it/it-tests/src/test/resources/issue/CommonRulesTest/xoo-common-rules-profile.xml
diff --git a/it/it-tests/src/test/resources/issue/suite/CustomRulesTest/custom.xml b/it/it-tests/src/test/resources/issue/CustomRulesTest/custom.xml
index b04d126115d..b04d126115d 100644
--- a/it/it-tests/src/test/resources/issue/suite/CustomRulesTest/custom.xml
+++ b/it/it-tests/src/test/resources/issue/CustomRulesTest/custom.xml
diff --git a/it/it-tests/src/test/resources/issue/suite/IssueActionTest/xoo-one-issue-per-line-profile.xml b/it/it-tests/src/test/resources/issue/IssueActionTest/xoo-one-issue-per-line-profile.xml
index 608f80cae96..608f80cae96 100644
--- a/it/it-tests/src/test/resources/issue/suite/IssueActionTest/xoo-one-issue-per-line-profile.xml
+++ b/it/it-tests/src/test/resources/issue/IssueActionTest/xoo-one-issue-per-line-profile.xml
diff --git a/it/it-tests/src/test/resources/issue/suite/IssueBulkChangeTest/one-issue-per-line-profile.xml b/it/it-tests/src/test/resources/issue/IssueBulkChangeTest/one-issue-per-line-profile.xml
index 365aa896a73..365aa896a73 100644
--- a/it/it-tests/src/test/resources/issue/suite/IssueBulkChangeTest/one-issue-per-line-profile.xml
+++ b/it/it-tests/src/test/resources/issue/IssueBulkChangeTest/one-issue-per-line-profile.xml
diff --git a/it/it-tests/src/test/resources/issue/suite/IssueChangelogTest/one-issue-per-line-profile.xml b/it/it-tests/src/test/resources/issue/IssueChangelogTest/one-issue-per-line-profile.xml
index 365aa896a73..365aa896a73 100644
--- a/it/it-tests/src/test/resources/issue/suite/IssueChangelogTest/one-issue-per-line-profile.xml
+++ b/it/it-tests/src/test/resources/issue/IssueChangelogTest/one-issue-per-line-profile.xml
diff --git a/it/it-tests/src/test/resources/issue/suite/IssueFilterExtensionTest/xoo-with-many-rules.xml b/it/it-tests/src/test/resources/issue/IssueFilterExtensionTest/xoo-with-many-rules.xml
index a08c9cdd246..a08c9cdd246 100644
--- a/it/it-tests/src/test/resources/issue/suite/IssueFilterExtensionTest/xoo-with-many-rules.xml
+++ b/it/it-tests/src/test/resources/issue/IssueFilterExtensionTest/xoo-with-many-rules.xml
diff --git a/it/it-tests/src/test/resources/issue/suite/IssuePurgeTest/with-many-rules.xml b/it/it-tests/src/test/resources/issue/IssuePurgeTest/with-many-rules.xml
index f3d0baf0616..f3d0baf0616 100644
--- a/it/it-tests/src/test/resources/issue/suite/IssuePurgeTest/with-many-rules.xml
+++ b/it/it-tests/src/test/resources/issue/IssuePurgeTest/with-many-rules.xml
diff --git a/it/it-tests/src/test/resources/issue/suite/IssueWorkflowTest/xoo-one-issue-per-line-profile.xml b/it/it-tests/src/test/resources/issue/IssueWorkflowTest/xoo-one-issue-per-line-profile.xml
index 608f80cae96..608f80cae96 100644
--- a/it/it-tests/src/test/resources/issue/suite/IssueWorkflowTest/xoo-one-issue-per-line-profile.xml
+++ b/it/it-tests/src/test/resources/issue/IssueWorkflowTest/xoo-one-issue-per-line-profile.xml
diff --git a/it/it-tests/src/test/resources/issue/suite/ManualRulesTest/create_edit_delete_manual_rule.html b/it/it-tests/src/test/resources/issue/ManualRulesTest/create_edit_delete_manual_rule.html
index 013655a4880..013655a4880 100644
--- a/it/it-tests/src/test/resources/issue/suite/ManualRulesTest/create_edit_delete_manual_rule.html
+++ b/it/it-tests/src/test/resources/issue/ManualRulesTest/create_edit_delete_manual_rule.html
diff --git a/it/it-tests/src/test/resources/measure/suite/one-issue-per-file.xml b/it/it-tests/src/test/resources/measure/one-issue-per-file.xml
index 7193ebfd779..7193ebfd779 100644
--- a/it/it-tests/src/test/resources/measure/suite/one-issue-per-file.xml
+++ b/it/it-tests/src/test/resources/measure/one-issue-per-file.xml
diff --git a/it/it-tests/src/test/resources/measure/suite/one-issue-per-line.xml b/it/it-tests/src/test/resources/measure/one-issue-per-line.xml
index 365aa896a73..365aa896a73 100644
--- a/it/it-tests/src/test/resources/measure/suite/one-issue-per-line.xml
+++ b/it/it-tests/src/test/resources/measure/one-issue-per-line.xml
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/save_with_special_characters.html b/it/it-tests/src/test/resources/measure/suite/measure_filters/save_with_special_characters.html
deleted file mode 100644
index 6b023a1d9cc..00000000000
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/save_with_special_characters.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <title>save_with_special_characters</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-
-    <tbody>
-    <tr>
-        <td>open</td>
-        <td>/sonar/sessions/logout</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>open</td>
-        <td>/sonar/sessions/new</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>login</td>
-        <td>admin</td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>password</td>
-        <td>admin</td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>commit</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>open</td>
-        <td>/sonar/measures</td>
-        <td></td>
-    </tr>
-    <tr>
-      <td>waitForElementPresent</td>
-      <td>name=qualifiers[]</td>
-      <td></td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>class=navigator-filter-submit</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>click</td>
-        <td>id=save-as</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>waitForElementPresent</td>
-        <td>save-as-filter-form</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>id=name</td>
-        <td>special $àé'@&quot;</td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>id=description</td>
-        <td>description with special characters &quot; ' éà</td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>id=save-as-submit</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertText</td>
-        <td>filter-description</td>
-        <td>*description with special characters &quot; ' éà*</td>
-    </tr>
-    <tr>
-        <td>click</td>
-        <td>class=navigator-filter-favorite</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>id=manage-favorites</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertText</td>
-        <td>my-filters</td>
-        <td>*special $àé'@&quot;*description with special characters &quot; ' éà*</td>
-    </tr>
-    <tr>
-        <td>click</td>
-        <td>id=delete_special-ae</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>waitForElementPresent</td>
-        <td>confirm-submit</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>click</td>
-        <td>id=confirm-submit</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>waitForNotText</td>
-        <td>my-filters</td>
-        <td>*special $àé'@&quot;*</td>
-    </tr>
-    </tbody>
-</table>
-</body>
-</html>
-
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/copy_measure_filter.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/copy_measure_filter.html
index d707a0d4fc6..d707a0d4fc6 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/copy_measure_filter.html
+++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/copy_measure_filter.html
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/copy_uniqueness_of_name.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/copy_uniqueness_of_name.html
index 10a3e686802..10a3e686802 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/copy_uniqueness_of_name.html
+++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/copy_uniqueness_of_name.html
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/empty_filter.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/empty_filter.html
index 65ebe3575ad..65ebe3575ad 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/empty_filter.html
+++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/empty_filter.html
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/initial_search_form.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/initial_search_form.html
index 863df6c057a..863df6c057a 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/initial_search_form.html
+++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/initial_search_form.html
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/link_from_main_header.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/link_from_main_header.html
index c92986d4489..c92986d4489 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/link_from_main_header.html
+++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/link_from_main_header.html
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_change_columns.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_change_columns.html
index febc4f83fdb..febc4f83fdb 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_change_columns.html
+++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_change_columns.html
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_delete_column.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_delete_column.html
index a747b2d1485..a747b2d1485 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_delete_column.html
+++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_delete_column.html
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_move_columns.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_move_columns.html
index 5bd4435387a..5bd4435387a 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_move_columns.html
+++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_move_columns.html
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_sort_by_descending_name.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_sort_by_descending_name.html
index c4d1c85ee57..c4d1c85ee57 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_sort_by_descending_name.html
+++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_sort_by_descending_name.html
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_sort_by_ncloc.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_sort_by_ncloc.html
index cc630f35100..cc630f35100 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_sort_by_ncloc.html
+++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_sort_by_ncloc.html
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_widget.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_widget.html
index f0d001840a9..f0d001840a9 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_widget.html
+++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_widget.html
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_widget_sort.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_widget_sort.html
index c1024fc568f..c1024fc568f 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_widget_sort.html
+++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_widget_sort.html
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_widget_warning_if_missing_filter.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_widget_warning_if_missing_filter.html
index 4bcd30c0ba4..4bcd30c0ba4 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/list_widget_warning_if_missing_filter.html
+++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/list_widget_warning_if_missing_filter.html
diff --git a/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/save_with_special_characters.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/save_with_special_characters.html
new file mode 100644
index 00000000000..949f3f16d21
--- /dev/null
+++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/save_with_special_characters.html
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+  <title>save_with_special_characters</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+
+  <tbody>
+  <tr>
+    <td>open</td>
+    <td>/sonar/sessions/logout</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>open</td>
+    <td>/sonar/sessions/new</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>type</td>
+    <td>login</td>
+    <td>admin</td>
+  </tr>
+  <tr>
+    <td>type</td>
+    <td>password</td>
+    <td>admin</td>
+  </tr>
+  <tr>
+    <td>clickAndWait</td>
+    <td>commit</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>open</td>
+    <td>/sonar/measures</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>waitForElementPresent</td>
+    <td>name=qualifiers[]</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>clickAndWait</td>
+    <td>class=navigator-filter-submit</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>click</td>
+    <td>id=save-as</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>waitForElementPresent</td>
+    <td>save-as-filter-form</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>type</td>
+    <td>id=name</td>
+    <td>special $àé'@&quot;</td>
+  </tr>
+  <tr>
+    <td>type</td>
+    <td>id=description</td>
+    <td>description with special characters &quot; ' éà</td>
+  </tr>
+  <tr>
+    <td>clickAndWait</td>
+    <td>id=save-as-submit</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>assertText</td>
+    <td>filter-description</td>
+    <td>*description with special characters &quot; ' éà*</td>
+  </tr>
+  <tr>
+    <td>click</td>
+    <td>class=navigator-filter-favorite</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>clickAndWait</td>
+    <td>id=manage-favorites</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>assertText</td>
+    <td>my-filters</td>
+    <td>*special $àé'@&quot;*description with special characters &quot; ' éà*</td>
+  </tr>
+  <tr>
+    <td>click</td>
+    <td>id=delete_special-ae</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>waitForElementPresent</td>
+    <td>confirm-submit</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>click</td>
+    <td>id=confirm-submit</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>waitForNotText</td>
+    <td>my-filters</td>
+    <td>*special $àé'@&quot;*</td>
+  </tr>
+  </tbody>
+</table>
+</body>
+</html>
+
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/search-by-key.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/search-by-key.html
index 07c702e52c2..07c702e52c2 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/search-by-key.html
+++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/search-by-key.html
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/search-by-name.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/search-by-name.html
index 4eef059a3d6..4eef059a3d6 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/search-by-name.html
+++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/search-by-name.html
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/search_for_files.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/search_for_files.html
index a24b655b4b8..a24b655b4b8 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/search_for_files.html
+++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/search_for_files.html
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/search_for_projects.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/search_for_projects.html
index 2dcb6f76233..2dcb6f76233 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/search_for_projects.html
+++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/search_for_projects.html
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/should-not-share-filter-when-user-have-no-sharing-permissions.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/should-not-share-filter-when-user-have-no-sharing-permissions.html
index 5747fa0bf04..5747fa0bf04 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/should-not-share-filter-when-user-have-no-sharing-permissions.html
+++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/should-not-share-filter-when-user-have-no-sharing-permissions.html
diff --git a/it/it-tests/src/test/resources/measure/suite/measure_filters/should-unshare-filter-remove-other-filters-favourite.html b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/should-unshare-filter-remove-other-filters-favourite.html
index cafdec948d4..cafdec948d4 100644
--- a/it/it-tests/src/test/resources/measure/suite/measure_filters/should-unshare-filter-remove-other-filters-favourite.html
+++ b/it/it-tests/src/test/resources/measureFilter/MeasureFiltersTest/should-unshare-filter-remove-other-filters-favourite.html
diff --git a/it/it-tests/src/test/resources/measure/suite/TimeMachineTest/one-issue-per-line-profile.xml b/it/it-tests/src/test/resources/measureHistory/one-issue-per-line-profile.xml
index 521adc7e06f..521adc7e06f 100644
--- a/it/it-tests/src/test/resources/measure/suite/TimeMachineTest/one-issue-per-line-profile.xml
+++ b/it/it-tests/src/test/resources/measureHistory/one-issue-per-line-profile.xml
diff --git a/it/it-tests/src/test/resources/permission/suite/one-issue-per-line-profile.xml b/it/it-tests/src/test/resources/permission/one-issue-per-line-profile.xml
index 521adc7e06f..521adc7e06f 100644
--- a/it/it-tests/src/test/resources/permission/suite/one-issue-per-line-profile.xml
+++ b/it/it-tests/src/test/resources/permission/one-issue-per-line-profile.xml
diff --git a/it/it-tests/src/test/resources/administration/suite/BulkDeletionTest/project-bulk-deletion/bulk-delete-filter-projects.html b/it/it-tests/src/test/resources/projectAdministration/BulkDeletionTest/bulk-delete-filter-projects.html
index 1991870c69d..1991870c69d 100644
--- a/it/it-tests/src/test/resources/administration/suite/BulkDeletionTest/project-bulk-deletion/bulk-delete-filter-projects.html
+++ b/it/it-tests/src/test/resources/projectAdministration/BulkDeletionTest/bulk-delete-filter-projects.html
diff --git a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/display-alerts-history-page/should-display-alerts-correctly-history-page.html b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/display-alerts-history-page/should-display-alerts-correctly-history-page.html
new file mode 100644
index 00000000000..4d0d7ac99c6
--- /dev/null
+++ b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/display-alerts-history-page/should-display-alerts-correctly-history-page.html
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+  <title>should-display-alerts-correctly-history-page</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+  <thead>
+  <tr>
+    <td rowspan="1" colspan="3">should-display-alerts-correctly-history-page</td>
+  </tr>
+  </thead>
+  <tbody>
+  <tr>
+    <td>open</td>
+    <td>/sonar/sessions/login</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>type</td>
+    <td>login</td>
+    <td>admin</td>
+  </tr>
+  <tr>
+    <td>type</td>
+    <td>password</td>
+    <td>admin</td>
+  </tr>
+  <tr>
+    <td>clickAndWait</td>
+    <td>commit</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>open</td>
+    <td>/sonar/dashboard/index/sample</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>click</td>
+    <td>css=#context-navigation .navbar-admin-link</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>waitForElementPresent</td>
+    <td>link=History</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>clickAndWait</td>
+    <td>link=History</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>assertElementPresent</td>
+    <td>//img[@title='Quality Gate Status: Green (was Orange). ']</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>assertElementPresent</td>
+    <td>//img[@title='Quality Gate Status: Orange. Lines > 5']</td>
+    <td></td>
+  </tr>
+  </tbody>
+</table>
+</body>
+</html>
diff --git a/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/display-alerts/should-display-period-alerts-correctly.html b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/display-alerts/should-display-period-alerts-correctly.html
index 9c4db5c8779..9c4db5c8779 100644
--- a/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/display-alerts/should-display-period-alerts-correctly.html
+++ b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/display-alerts/should-display-period-alerts-correctly.html
diff --git a/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/module-settings/display-module-settings.html b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/module-settings/display-module-settings.html
index f9137271bca..f9137271bca 100644
--- a/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/module-settings/display-module-settings.html
+++ b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/module-settings/display-module-settings.html
diff --git a/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/project-administration/multimodule-project-delete-version.html b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-administration/multimodule-project-delete-version.html
index 58b94913711..58b94913711 100644
--- a/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/project-administration/multimodule-project-delete-version.html
+++ b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-administration/multimodule-project-delete-version.html
diff --git a/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/project-administration/multimodule-project-modify-version.html b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-administration/multimodule-project-modify-version.html
index ef798b5cf36..ef798b5cf36 100644
--- a/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/project-administration/multimodule-project-modify-version.html
+++ b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-administration/multimodule-project-modify-version.html
diff --git a/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/project-deletion/project-deletion.html b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-deletion/project-deletion.html
index e424badc70a..e424badc70a 100644
--- a/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/project-deletion/project-deletion.html
+++ b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-deletion/project-deletion.html
diff --git a/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/project-settings/only-on-project-settings.html b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-settings/only-on-project-settings.html
index f90a77b2037..f90a77b2037 100644
--- a/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/project-settings/only-on-project-settings.html
+++ b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-settings/only-on-project-settings.html
diff --git a/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/project-settings/override-global-settings.html b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-settings/override-global-settings.html
index db0eab19545..4b068f4793c 100644
--- a/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/project-settings/override-global-settings.html
+++ b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-settings/override-global-settings.html
@@ -3,13 +3,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <title>override-global-settings</title>
+	<title>override-global-settings</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
     <thead>
     <tr>
-        <td rowspan="1" colspan="3">override-global-settings</td>
+			<td rowspan="1" colspan="3">override-global-settings</td>
     </tr>
     </thead>
     <tbody>
@@ -43,9 +43,9 @@
 	<td>id=input_sonar.skippedModules</td>
 	<td>my-excluded-module</td>
 </tr>
-<tr>
-	<td>click</td>
-	<td>id=submit_settings</td>
+		<tr>
+			<td>click</td>
+			<td>id=submit_settings</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-duplicate-keys.html b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-duplicate-keys.html
index b58daa1a5e2..b58daa1a5e2 100644
--- a/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-duplicate-keys.html
+++ b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-duplicate-keys.html
diff --git a/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-no-input.html b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-no-input.html
new file mode 100644
index 00000000000..414c422f2d2
--- /dev/null
+++ b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-no-input.html
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+  <title>bulk-update-impossible-because-no-input</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+  <tbody>
+  <tr>
+    <td>open</td>
+    <td>/sonar/sessions/logout</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>open</td>
+    <td>/sonar/sessions/login</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>type</td>
+    <td>login</td>
+    <td>admin</td>
+  </tr>
+  <tr>
+    <td>type</td>
+    <td>password</td>
+    <td>admin</td>
+  </tr>
+  <tr>
+    <td>clickAndWait</td>
+    <td>commit</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>open</td>
+    <td>/sonar/dashboard/index/com.sonarsource.it.samples:multi-modules-sample</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>click</td>
+    <td>css=#context-navigation .navbar-admin-link</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>waitForElementPresent</td>
+    <td>link=Update Key</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>clickAndWait</td>
+    <td>link=Update Key</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>clickAndWait</td>
+    <td>id=bulk_update_button</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>assertText</td>
+    <td>content</td>
+    <td>*The two fields can not be blank for the bulk update.*</td>
+  </tr>
+  </tbody>
+</table>
+</body>
+</html>
diff --git a/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-no-match.html b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-no-match.html
index f42db7bc348..f42db7bc348 100644
--- a/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-no-match.html
+++ b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-impossible-because-no-match.html
diff --git a/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/project-update-keys/bulk-update-success.html b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-success.html
index 20d7fbbd725..20d7fbbd725 100644
--- a/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/project-update-keys/bulk-update-success.html
+++ b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/bulk-update-success.html
diff --git a/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/project-update-keys/fine-grained-update-impossible.html b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/fine-grained-update-impossible.html
index 7bf565c8221..7bf565c8221 100644
--- a/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/project-update-keys/fine-grained-update-impossible.html
+++ b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/fine-grained-update-impossible.html
diff --git a/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/project-update-keys/fine-grained-update-success.html b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/fine-grained-update-success.html
index eff5373a8c6..eff5373a8c6 100644
--- a/it/it-tests/src/test/resources/administration/suite/ProjectAdministrationTest/project-update-keys/fine-grained-update-success.html
+++ b/it/it-tests/src/test/resources/projectAdministration/ProjectAdministrationTest/project-update-keys/fine-grained-update-success.html
diff --git a/it/it-tests/src/test/resources/server/ServerAdministrationTest/server_id/missing_ip.html b/it/it-tests/src/test/resources/server/ServerAdministrationTest/server_id/missing_ip.html
deleted file mode 100644
index f946aaebbba..00000000000
--- a/it/it-tests/src/test/resources/server/ServerAdministrationTest/server_id/missing_ip.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <title>missing_ip</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-    <thead>
-    <tr>
-        <td rowspan="1" colspan="3">missing_ip</td>
-    </tr>
-    </thead>
-    <tbody>
-    <tr>
-        <td>open</td>
-        <td>/sonar/sessions/new</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>login</td>
-        <td>admin</td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>password</td>
-        <td>admin</td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>commit</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>open</td>
-        <td>/sonar/settings/index</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>link=Licenses</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>link=Server ID</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>selectFrame</td>
-        <td>settings_iframe</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>name=organisation</td>
-        <td>DEMO</td>
-    </tr>
-    <tr>
-        <td>type</td>
-        <td>name=address</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>clickAndWait</td>
-        <td>generate-button</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertElementPresent</td>
-        <td>error</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertElementNotPresent</td>
-        <td>server_id</td>
-        <td></td>
-    </tr>
-    </tbody>
-</table>
-</body>
-</html>
diff --git a/it/it-tests/src/test/resources/server/ServerTest/hide-jdbc-settings.html b/it/it-tests/src/test/resources/server/ServerTest/hide-jdbc-settings.html
deleted file mode 100644
index e223287d9e4..00000000000
--- a/it/it-tests/src/test/resources/server/ServerTest/hide-jdbc-settings.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-    <title>hide-jdbc-settings</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-    <thead>
-    <tr>
-        <td rowspan="1" colspan="3">hide-jdbc-settings</td>
-    </tr>
-    </thead>
-    <tbody>
-    <tr>
-        <td>open</td>
-        <td>/sonar/setup/index</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>assertTextNotPresent</td>
-        <td>jdbc:</td>
-        <td></td>
-    </tr>
-
-    </tbody>
-</table>
-</body>
-</html>
diff --git a/it/it-tests/src/test/resources/server/ServerTest/url_ending_by_jsp.html b/it/it-tests/src/test/resources/server/ServerTest/url_ending_by_jsp.html
deleted file mode 100644
index 4e8715c3d18..00000000000
--- a/it/it-tests/src/test/resources/server/ServerTest/url_ending_by_jsp.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-    <tbody>
-    <tr>
-        <td>open</td>
-        <td>/sonar/dashboard/index/myproject.jsp</td>
-        <td></td>
-    </tr>
-    <tr>
-        <td>waitForElementPresent</td>
-        <td>css=#dashboard</td>
-        <td></td>
-    </tr>
-</table>
-</body>
-</html>
diff --git a/it/it-tests/src/test/resources/server/HttpsTest/keystore.jks b/it/it-tests/src/test/resources/serverSystem/HttpsTest/keystore.jks
index 13234b49dc2..13234b49dc2 100644
--- a/it/it-tests/src/test/resources/server/HttpsTest/keystore.jks
+++ b/it/it-tests/src/test/resources/serverSystem/HttpsTest/keystore.jks
diff --git a/it/it-tests/src/test/resources/server/HttpsTest/keystore.jks.txt b/it/it-tests/src/test/resources/serverSystem/HttpsTest/keystore.jks.txt
index ce4a4adfc39..ce4a4adfc39 100644
--- a/it/it-tests/src/test/resources/server/HttpsTest/keystore.jks.txt
+++ b/it/it-tests/src/test/resources/serverSystem/HttpsTest/keystore.jks.txt
diff --git a/it/it-tests/src/test/resources/server/ServerTest/derby-warning.html b/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/derby-warning.html
index 2fac7ea6548..2fac7ea6548 100644
--- a/it/it-tests/src/test/resources/server/ServerTest/derby-warning.html
+++ b/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/derby-warning.html
diff --git a/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/hide-jdbc-settings.html b/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/hide-jdbc-settings.html
new file mode 100644
index 00000000000..e5d4b03cfc8
--- /dev/null
+++ b/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/hide-jdbc-settings.html
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ SonarQube, open source software quality management tool.
+  ~ Copyright (C) 2008-2014 SonarSource
+  ~ mailto:contact AT sonarsource DOT com
+  ~
+  ~ SonarQube is free software; you can redistribute it and/or
+  ~ modify it under the terms of the GNU Lesser General Public
+  ~ License as published by the Free Software Foundation; either
+  ~ version 3 of the License, or (at your option) any later version.
+  ~
+  ~ SonarQube is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public License
+  ~ along with this program; if not, write to the Free Software Foundation,
+  ~ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+  -->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+  <title>hide-jdbc-settings</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+  <thead>
+  <tr>
+    <td rowspan="1" colspan="3">hide-jdbc-settings</td>
+  </tr>
+  </thead>
+  <tbody>
+  <tr>
+    <td>open</td>
+    <td>/sonar/setup/index</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>assertTextNotPresent</td>
+    <td>jdbc:</td>
+    <td></td>
+  </tr>
+
+  </tbody>
+</table>
+</body>
+</html>
diff --git a/it/it-tests/src/test/resources/server/ServerTest/incompatible-plugin-1.0.jar b/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/incompatible-plugin-1.0.jar
index a998a46bb29..a998a46bb29 100644
--- a/it/it-tests/src/test/resources/server/ServerTest/incompatible-plugin-1.0.jar
+++ b/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/incompatible-plugin-1.0.jar
diff --git a/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/missing_ip.html b/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/missing_ip.html
new file mode 100644
index 00000000000..689e52811b7
--- /dev/null
+++ b/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/missing_ip.html
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ SonarQube, open source software quality management tool.
+  ~ Copyright (C) 2008-2014 SonarSource
+  ~ mailto:contact AT sonarsource DOT com
+  ~
+  ~ SonarQube is free software; you can redistribute it and/or
+  ~ modify it under the terms of the GNU Lesser General Public
+  ~ License as published by the Free Software Foundation; either
+  ~ version 3 of the License, or (at your option) any later version.
+  ~
+  ~ SonarQube is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public License
+  ~ along with this program; if not, write to the Free Software Foundation,
+  ~ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+  -->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+  <title>missing_ip</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+  <thead>
+  <tr>
+    <td rowspan="1" colspan="3">missing_ip</td>
+  </tr>
+  </thead>
+  <tbody>
+  <tr>
+    <td>open</td>
+    <td>/sonar/sessions/new</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>type</td>
+    <td>login</td>
+    <td>admin</td>
+  </tr>
+  <tr>
+    <td>type</td>
+    <td>password</td>
+    <td>admin</td>
+  </tr>
+  <tr>
+    <td>clickAndWait</td>
+    <td>commit</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>open</td>
+    <td>/sonar/settings/index</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>clickAndWait</td>
+    <td>link=Licenses</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>clickAndWait</td>
+    <td>link=Server ID</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>selectFrame</td>
+    <td>settings_iframe</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>type</td>
+    <td>name=organisation</td>
+    <td>DEMO</td>
+  </tr>
+  <tr>
+    <td>type</td>
+    <td>name=address</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>clickAndWait</td>
+    <td>generate-button</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>assertElementPresent</td>
+    <td>error</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>assertElementNotPresent</td>
+    <td>server_id</td>
+    <td></td>
+  </tr>
+  </tbody>
+</table>
+</body>
+</html>
diff --git a/it/it-tests/src/test/resources/server/ServerAdministrationTest/server_id/organisation_must_not_accept_special_chars.html b/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/organisation_must_not_accept_special_chars.html
index 7aaee957676..7aaee957676 100644
--- a/it/it-tests/src/test/resources/server/ServerAdministrationTest/server_id/organisation_must_not_accept_special_chars.html
+++ b/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/organisation_must_not_accept_special_chars.html
diff --git a/it/it-tests/src/test/resources/server/ServerAdministrationTest/server-administration/system_info.html b/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/system_info.html
index 2527e2e48f2..2527e2e48f2 100644
--- a/it/it-tests/src/test/resources/server/ServerAdministrationTest/server-administration/system_info.html
+++ b/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/system_info.html
diff --git a/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/url_ending_by_jsp.html b/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/url_ending_by_jsp.html
new file mode 100644
index 00000000000..616bad5e84a
--- /dev/null
+++ b/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/url_ending_by_jsp.html
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ SonarQube, open source software quality management tool.
+  ~ Copyright (C) 2008-2014 SonarSource
+  ~ mailto:contact AT sonarsource DOT com
+  ~
+  ~ SonarQube is free software; you can redistribute it and/or
+  ~ modify it under the terms of the GNU Lesser General Public
+  ~ License as published by the Free Software Foundation; either
+  ~ version 3 of the License, or (at your option) any later version.
+  ~
+  ~ SonarQube is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public License
+  ~ along with this program; if not, write to the Free Software Foundation,
+  ~ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+  -->
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+  <tbody>
+  <tr>
+    <td>open</td>
+    <td>/sonar/dashboard/index/myproject.jsp</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>waitForElementPresent</td>
+    <td>css=#dashboard</td>
+    <td></td>
+  </tr>
+</table>
+</body>
+</html>
diff --git a/it/it-tests/src/test/resources/server/ServerAdministrationTest/server_id/valid_id.html b/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/valid_id.html
index ead837d11c8..ead837d11c8 100644
--- a/it/it-tests/src/test/resources/server/ServerAdministrationTest/server_id/valid_id.html
+++ b/it/it-tests/src/test/resources/serverSystem/ServerSystemTest/valid_id.html
diff --git a/it/it-tests/src/test/resources/administration/suite/PropertySetsTest/auto-generated/create.html b/it/it-tests/src/test/resources/settings/PropertySetsTest/auto-generated/create.html
index e562216ca56..e562216ca56 100644
--- a/it/it-tests/src/test/resources/administration/suite/PropertySetsTest/auto-generated/create.html
+++ b/it/it-tests/src/test/resources/settings/PropertySetsTest/auto-generated/create.html
diff --git a/it/it-tests/src/test/resources/administration/suite/PropertySetsTest/auto-generated/update.html b/it/it-tests/src/test/resources/settings/PropertySetsTest/auto-generated/update.html
index 0cc6d84f611..0cc6d84f611 100644
--- a/it/it-tests/src/test/resources/administration/suite/PropertySetsTest/auto-generated/update.html
+++ b/it/it-tests/src/test/resources/settings/PropertySetsTest/auto-generated/update.html
diff --git a/it/it-tests/src/test/resources/settings/PropertySetsTest/property-sets/all_types.html b/it/it-tests/src/test/resources/settings/PropertySetsTest/property-sets/all_types.html
new file mode 100644
index 00000000000..7f0a8728b69
--- /dev/null
+++ b/it/it-tests/src/test/resources/settings/PropertySetsTest/property-sets/all_types.html
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+  <title>all_types</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+  <tbody>
+  <tr>
+    <td>open</td>
+    <td>/sonar/sessions/new</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>type</td>
+    <td>login</td>
+    <td>admin</td>
+  </tr>
+  <tr>
+    <td>type</td>
+    <td>password</td>
+    <td>admin</td>
+  </tr>
+  <tr>
+    <td>clickAndWait</td>
+    <td>commit</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>open</td>
+    <td>/sonar/settings?category=DEV</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>waitForValue</td>
+    <td>name=page_version</td>
+    <td>1</td>
+  </tr>
+  <tr>
+    <td>type</td>
+    <td>id=input_text</td>
+    <td>text</td>
+  </tr>
+  <tr>
+    <td>select</td>
+    <td>id=input_boolean</td>
+    <td>label=True</td>
+  </tr>
+  <tr>
+    <td>type</td>
+    <td>id=input_float</td>
+    <td>42.0</td>
+  </tr>
+  <tr>
+    <td>type</td>
+    <td>id=input_license</td>
+    <td>abc</td>
+  </tr>
+  <tr>
+    <td>select</td>
+    <td>id=input_metric</td>
+    <td>label=Overall condition coverage</td>
+  </tr>
+  <tr>
+    <td>type</td>
+    <td>id=input_password</td>
+    <td>abcde</td>
+  </tr>
+  <tr>
+    <td>type</td>
+    <td>id=input_regexp</td>
+    <td>.*</td>
+  </tr>
+  <tr>
+    <td>select</td>
+    <td>id=input_list</td>
+    <td>label=AAA</td>
+  </tr>
+  <tr>
+    <td>click</td>
+    <td>id=submit_settings</td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>waitForValue</td>
+    <td>name=page_version</td>
+    <td>2</td>
+  </tr>
+  <tr>
+    <td>assertValue</td>
+    <td>id=input_text</td>
+    <td>text</td>
+  </tr>
+  <tr>
+    <td>assertValue</td>
+    <td>id=input_boolean</td>
+    <td>true</td>
+  </tr>
+  <tr>
+    <td>assertValue</td>
+    <td>id=input_float</td>
+    <td>42.0</td>
+  </tr>
+  <tr>
+    <td>assertValue</td>
+    <td>id=input_license</td>
+    <td>abc</td>
+  </tr>
+  <tr>
+    <td>assertValue</td>
+    <td>id=input_metric</td>
+    <td>overall_branch_coverage</td>
+  </tr>
+  <tr>
+    <td>assertValue</td>
+    <td>id=input_password</td>
+    <td>{{*******************}}</td>
+  </tr>
+  <tr>
+    <td>assertValue</td>
+    <td>id=input_regexp</td>
+    <td>exact:.*</td>
+  </tr>
+  <tr>
+    <td>assertValue</td>
+    <td>id=input_list</td>
+    <td>AAA</td>
+  </tr>
+  </tbody>
+</table>
+</body>
+</html>
diff --git a/it/it-tests/src/test/resources/administration/suite/PropertySetsTest/property-sets/create.html b/it/it-tests/src/test/resources/settings/PropertySetsTest/property-sets/create.html
index 6722841897e..6722841897e 100644
--- a/it/it-tests/src/test/resources/administration/suite/PropertySetsTest/property-sets/create.html
+++ b/it/it-tests/src/test/resources/settings/PropertySetsTest/property-sets/create.html
diff --git a/it/it-tests/src/test/resources/administration/suite/PropertySetsTest/property-sets/delete.html b/it/it-tests/src/test/resources/settings/PropertySetsTest/property-sets/delete.html
index 2e881114d98..2e881114d98 100644
--- a/it/it-tests/src/test/resources/administration/suite/PropertySetsTest/property-sets/delete.html
+++ b/it/it-tests/src/test/resources/settings/PropertySetsTest/property-sets/delete.html
diff --git a/it/it-tests/src/test/resources/administration/suite/PropertySetsTest/property-sets/reference.html b/it/it-tests/src/test/resources/settings/PropertySetsTest/property-sets/reference.html
index 0792bc556f9..0792bc556f9 100644
--- a/it/it-tests/src/test/resources/administration/suite/PropertySetsTest/property-sets/reference.html
+++ b/it/it-tests/src/test/resources/settings/PropertySetsTest/property-sets/reference.html
diff --git a/it/it-tests/src/test/resources/server/ServerTest/settings/display-license.html b/it/it-tests/src/test/resources/settings/SettingsTest/display-license.html
index ec3d5e86821..ec3d5e86821 100644
--- a/it/it-tests/src/test/resources/server/ServerTest/settings/display-license.html
+++ b/it/it-tests/src/test/resources/settings/SettingsTest/display-license.html
diff --git a/it/it-tests/src/test/resources/server/ServerTest/settings/display-untyped-license.html b/it/it-tests/src/test/resources/settings/SettingsTest/display-untyped-license.html
index b824efb36cd..b824efb36cd 100644
--- a/it/it-tests/src/test/resources/server/ServerTest/settings/display-untyped-license.html
+++ b/it/it-tests/src/test/resources/settings/SettingsTest/display-untyped-license.html
diff --git a/it/it-tests/src/test/resources/server/ServerTest/settings/encrypt-text.html b/it/it-tests/src/test/resources/settings/SettingsTest/encrypt-text.html
index 521edc1e4de..521edc1e4de 100644
--- a/it/it-tests/src/test/resources/server/ServerTest/settings/encrypt-text.html
+++ b/it/it-tests/src/test/resources/settings/SettingsTest/encrypt-text.html
diff --git a/it/it-tests/src/test/resources/server/ServerTest/settings/general-settings.html b/it/it-tests/src/test/resources/settings/SettingsTest/general-settings.html
index e8b6a5554df..e8b6a5554df 100644
--- a/it/it-tests/src/test/resources/server/ServerTest/settings/general-settings.html
+++ b/it/it-tests/src/test/resources/settings/SettingsTest/general-settings.html
diff --git a/it/it-tests/src/test/resources/server/ServerTest/settings/generate-secret-key.html b/it/it-tests/src/test/resources/settings/SettingsTest/generate-secret-key.html
index 61128b0ec5f..61128b0ec5f 100644
--- a/it/it-tests/src/test/resources/server/ServerTest/settings/generate-secret-key.html
+++ b/it/it-tests/src/test/resources/settings/SettingsTest/generate-secret-key.html
diff --git a/it/it-tests/src/test/resources/server/ServerTest/settings/global-extension-property.html b/it/it-tests/src/test/resources/settings/SettingsTest/global-extension-property.html
index a96d9ccdc13..a96d9ccdc13 100644
--- a/it/it-tests/src/test/resources/server/ServerTest/settings/global-extension-property.html
+++ b/it/it-tests/src/test/resources/settings/SettingsTest/global-extension-property.html
diff --git a/it/it-tests/src/test/resources/server/ServerTest/settings/hidden-extension-property.html b/it/it-tests/src/test/resources/settings/SettingsTest/hidden-extension-property.html
index b1ccfb97130..b1ccfb97130 100644
--- a/it/it-tests/src/test/resources/server/ServerTest/settings/hidden-extension-property.html
+++ b/it/it-tests/src/test/resources/settings/SettingsTest/hidden-extension-property.html
diff --git a/it/it-tests/src/test/resources/server/ServerTest/settings/hide-passwords.html b/it/it-tests/src/test/resources/settings/SettingsTest/hide-passwords.html
index 68db3b6a6f7..68db3b6a6f7 100644
--- a/it/it-tests/src/test/resources/server/ServerTest/settings/hide-passwords.html
+++ b/it/it-tests/src/test/resources/settings/SettingsTest/hide-passwords.html
diff --git a/it/it-tests/src/test/resources/server/ServerTest/settings/ignore-corrupted-license.html b/it/it-tests/src/test/resources/settings/SettingsTest/ignore-corrupted-license.html
index 54c71066f48..54c71066f48 100644
--- a/it/it-tests/src/test/resources/server/ServerTest/settings/ignore-corrupted-license.html
+++ b/it/it-tests/src/test/resources/settings/SettingsTest/ignore-corrupted-license.html
diff --git a/it/it-tests/src/test/resources/server/ServerTest/settings/property_relocation.html b/it/it-tests/src/test/resources/settings/SettingsTest/property_relocation.html
index dd35bb04664..dd35bb04664 100644
--- a/it/it-tests/src/test/resources/server/ServerTest/settings/property_relocation.html
+++ b/it/it-tests/src/test/resources/settings/SettingsTest/property_relocation.html
diff --git a/it/it-tests/src/test/resources/server/ServerTest/settings-default-value.html b/it/it-tests/src/test/resources/settings/SettingsTest/settings-default-value.html
index 70e59f6de88..70e59f6de88 100644
--- a/it/it-tests/src/test/resources/server/ServerTest/settings-default-value.html
+++ b/it/it-tests/src/test/resources/settings/SettingsTest/settings-default-value.html
diff --git a/it/it-tests/src/test/resources/server/ServerTest/sonar-secret.txt b/it/it-tests/src/test/resources/settings/SettingsTest/sonar-secret.txt
index 65b98c522da..65b98c522da 100644
--- a/it/it-tests/src/test/resources/server/ServerTest/sonar-secret.txt
+++ b/it/it-tests/src/test/resources/settings/SettingsTest/sonar-secret.txt
diff --git a/it/it-tests/src/test/resources/server/ServerTest/settings/validate-property-type.html b/it/it-tests/src/test/resources/settings/SettingsTest/validate-property-type.html
index 6ed955d1ea6..6ed955d1ea6 100644
--- a/it/it-tests/src/test/resources/server/ServerTest/settings/validate-property-type.html
+++ b/it/it-tests/src/test/resources/settings/SettingsTest/validate-property-type.html
diff --git a/it/it-tests/src/test/resources/administration/suite/SubCategoriesTest/subcategories/global-subcategories-no-default.html b/it/it-tests/src/test/resources/settings/subcategories/global-subcategories-no-default.html
index f6b410b562c..f6b410b562c 100644
--- a/it/it-tests/src/test/resources/administration/suite/SubCategoriesTest/subcategories/global-subcategories-no-default.html
+++ b/it/it-tests/src/test/resources/settings/subcategories/global-subcategories-no-default.html
diff --git a/it/it-tests/src/test/resources/administration/suite/SubCategoriesTest/subcategories/global-subcategories.html b/it/it-tests/src/test/resources/settings/subcategories/global-subcategories.html
index 6f9896fa32f..6f9896fa32f 100644
--- a/it/it-tests/src/test/resources/administration/suite/SubCategoriesTest/subcategories/global-subcategories.html
+++ b/it/it-tests/src/test/resources/settings/subcategories/global-subcategories.html
diff --git a/it/it-tests/src/test/resources/administration/suite/SubCategoriesTest/subcategories/project-subcategories-no-default.html b/it/it-tests/src/test/resources/settings/subcategories/project-subcategories-no-default.html
index 875e7fc7657..875e7fc7657 100644
--- a/it/it-tests/src/test/resources/administration/suite/SubCategoriesTest/subcategories/project-subcategories-no-default.html
+++ b/it/it-tests/src/test/resources/settings/subcategories/project-subcategories-no-default.html
diff --git a/it/it-tests/src/test/resources/administration/suite/SubCategoriesTest/subcategories/project-subcategories.html b/it/it-tests/src/test/resources/settings/subcategories/project-subcategories.html
index e3284d63f16..e3284d63f16 100644
--- a/it/it-tests/src/test/resources/administration/suite/SubCategoriesTest/subcategories/project-subcategories.html
+++ b/it/it-tests/src/test/resources/settings/subcategories/project-subcategories.html
diff --git a/it/it-tests/src/test/resources/testing/suite/CoverageTest/it_coverage-expected.json b/it/it-tests/src/test/resources/test/CoverageTest/it_coverage-expected.json
index 1bf11e70671..443362d0d6b 100644
--- a/it/it-tests/src/test/resources/testing/suite/CoverageTest/it_coverage-expected.json
+++ b/it/it-tests/src/test/resources/test/CoverageTest/it_coverage-expected.json
@@ -73,5 +73,4 @@
       "code": "",
     }
   ]
-
 }
diff --git a/it/it-tests/src/test/resources/testing/suite/CoverageTest/unit_test_coverage-expected.json b/it/it-tests/src/test/resources/test/CoverageTest/unit_test_coverage-expected.json
index ae72588b5b0..ae72588b5b0 100644
--- a/it/it-tests/src/test/resources/testing/suite/CoverageTest/unit_test_coverage-expected.json
+++ b/it/it-tests/src/test/resources/test/CoverageTest/unit_test_coverage-expected.json
diff --git a/it/it-tests/src/test/resources/testing/suite/CoverageTest/unit_test_coverage_no_condition-expected.json b/it/it-tests/src/test/resources/test/CoverageTest/unit_test_coverage_no_condition-expected.json
index 6f5d2f7cd10..6f5d2f7cd10 100644
--- a/it/it-tests/src/test/resources/testing/suite/CoverageTest/unit_test_coverage_no_condition-expected.json
+++ b/it/it-tests/src/test/resources/test/CoverageTest/unit_test_coverage_no_condition-expected.json
diff --git a/it/it-tests/src/test/resources/testing/suite/CoverageTest/ut_and_it_coverage-expected.json b/it/it-tests/src/test/resources/test/CoverageTest/ut_and_it_coverage-expected.json
index 9d12abbba9c..9d12abbba9c 100644
--- a/it/it-tests/src/test/resources/testing/suite/CoverageTest/ut_and_it_coverage-expected.json
+++ b/it/it-tests/src/test/resources/test/CoverageTest/ut_and_it_coverage-expected.json
diff --git a/it/it-tests/src/test/resources/testing/suite/CoverageTrackingTest/covered_files-expected.json b/it/it-tests/src/test/resources/test/CoverageTrackingTest/covered_files-expected.json
index 5dda4f3dd11..5dda4f3dd11 100644
--- a/it/it-tests/src/test/resources/testing/suite/CoverageTrackingTest/covered_files-expected.json
+++ b/it/it-tests/src/test/resources/test/CoverageTrackingTest/covered_files-expected.json
diff --git a/it/it-tests/src/test/resources/testing/suite/CoverageTrackingTest/tests-expected.json b/it/it-tests/src/test/resources/test/CoverageTrackingTest/tests-expected.json
index f957eca7bc2..f957eca7bc2 100644
--- a/it/it-tests/src/test/resources/testing/suite/CoverageTrackingTest/tests-expected.json
+++ b/it/it-tests/src/test/resources/test/CoverageTrackingTest/tests-expected.json
diff --git a/it/it-tests/src/test/resources/testing/suite/TestExecutionTest/expected.json b/it/it-tests/src/test/resources/test/TestExecutionTest/expected.json
index 8ad71d649bc..8ad71d649bc 100644
--- a/it/it-tests/src/test/resources/testing/suite/TestExecutionTest/expected.json
+++ b/it/it-tests/src/test/resources/test/TestExecutionTest/expected.json
diff --git a/it/it-tests/src/test/resources/updatecenter/UpdateCenterTest/update-center.properties b/it/it-tests/src/test/resources/updateCenter/UpdateCenterTest/update-center.properties
index 5882d43188f..5882d43188f 100644
--- a/it/it-tests/src/test/resources/updatecenter/UpdateCenterTest/update-center.properties
+++ b/it/it-tests/src/test/resources/updateCenter/UpdateCenterTest/update-center.properties
diff --git a/it/it-tests/src/test/resources/updatecenter/installed-plugins.html b/it/it-tests/src/test/resources/updateCenter/installed-plugins.html
index 552d627d1b8..552d627d1b8 100644
--- a/it/it-tests/src/test/resources/updatecenter/installed-plugins.html
+++ b/it/it-tests/src/test/resources/updateCenter/installed-plugins.html