30 files changed, 7 insertions, 6 deletions
diff --git a/.cix.yml b/.cix.yml
index c37b9162038..d6df6065a51 100644
--- a/.cix.yml
+++ b/.cix.yml
@@ -28,5 +28,5 @@ exclude:
     SLAVE_TYPE: performance
   - RUN_ACTIVITY: run-it-released-plugins
     SLAVE_TYPE: performance
-  - RUN_ACTIVITY: run-it-released-plugins
+  - RUN_ACTIVITY: run-perf-tests
     SLAVE_TYPE: gva
diff --git a/pom.xml b/pom.xml
index db8c4619095..5da65796257 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1509,10 +1509,11 @@
     </profile>
 
     <profile>
-      <!-- integration tests -->
-      <id>it</id>
+      <!-- integration and performance tests -->
+      <id>tests</id>
       <modules>
         <module>it</module>
+        <module>tests/perf</module>
       </modules>
     </profile>
   </profiles>
diff --git a/run-perf-tests.sh b/run-perf-tests.sh
index 8d8a221d0f6..d16d80c981b 100755
--- a/run-perf-tests.sh
+++ b/run-perf-tests.sh
@@ -2,5 +2,5 @@
 set -euo pipefail
 
 echo 'Run performance tests'
-cd it/perf-tests
+cd tests/perf
 mvn verify -B -e -V $*
diff --git a/it/perf-tests/pom.xml b/tests/perf/pom.xml
index 2413bfe8f7d..f9184b1a87b 100644
--- a/it/perf-tests/pom.xml
+++ b/tests/perf/pom.xml
@@ -5,11 +5,11 @@
 
   <parent>
     <groupId>org.sonarsource.sonarqube</groupId>
-    <artifactId>it</artifactId>
+    <artifactId>sonarqube</artifactId>
     <version>5.5-SNAPSHOT</version>
   </parent>
 
-  <artifactId>perf-tests</artifactId>
+  <artifactId>perf</artifactId>
   <name>SonarQube :: Performance Tests</name>
 
   <properties>
diff --git a/it/perf-tests/projects/huge-file/pom.xml b/tests/perf/projects/huge-file/pom.xml
index d5a69b06339..d5a69b06339 100644
--- a/it/perf-tests/projects/huge-file/pom.xml
+++ b/tests/perf/projects/huge-file/pom.xml
diff --git a/it/perf-tests/projects/huge-file/src/main/java/huge/HugeFile.java b/tests/perf/projects/huge-file/src/main/java/huge/HugeFile.java
index 5d6c1643294..5d6c1643294 100644
--- a/it/perf-tests/projects/huge-file/src/main/java/huge/HugeFile.java
+++ b/tests/perf/projects/huge-file/src/main/java/huge/HugeFile.java
diff --git a/it/perf-tests/projects/xoo-sample/sonar-project.properties b/tests/perf/projects/xoo-sample/sonar-project.properties
index 318ff23471b..318ff23471b 100644
--- a/it/perf-tests/projects/xoo-sample/sonar-project.properties
+++ b/tests/perf/projects/xoo-sample/sonar-project.properties
diff --git a/it/perf-tests/projects/xoo-sample/src/main/xoo/sample/Sample.xoo b/tests/perf/projects/xoo-sample/src/main/xoo/sample/Sample.xoo
index b1210973dd9..b1210973dd9 100644
--- a/it/perf-tests/projects/xoo-sample/src/main/xoo/sample/Sample.xoo
+++ b/tests/perf/projects/xoo-sample/src/main/xoo/sample/Sample.xoo
diff --git a/it/perf-tests/projects/xoo-sample/src/main/xoo/sample/Sample.xoo.measures b/tests/perf/projects/xoo-sample/src/main/xoo/sample/Sample.xoo.measures
index 415567363b0..415567363b0 100644
--- a/it/perf-tests/projects/xoo-sample/src/main/xoo/sample/Sample.xoo.measures
+++ b/tests/perf/projects/xoo-sample/src/main/xoo/sample/Sample.xoo.measures
diff --git a/it/perf-tests/projects/xoo-sample/src/test/xoo/sample/SampleTest.xoo b/tests/perf/projects/xoo-sample/src/test/xoo/sample/SampleTest.xoo
index 1392fc64ebf..1392fc64ebf 100644
--- a/it/perf-tests/projects/xoo-sample/src/test/xoo/sample/SampleTest.xoo
+++ b/tests/perf/projects/xoo-sample/src/test/xoo/sample/SampleTest.xoo
diff --git a/it/perf-tests/projects/xoo-sample/src/test/xoo/sample/SampleTest.xoo.measures b/tests/perf/projects/xoo-sample/src/test/xoo/sample/SampleTest.xoo.measures
index b924b6953f3..b924b6953f3 100644
--- a/it/perf-tests/projects/xoo-sample/src/test/xoo/sample/SampleTest.xoo.measures
+++ b/tests/perf/projects/xoo-sample/src/test/xoo/sample/SampleTest.xoo.measures
diff --git a/it/perf-tests/src/main/java/org/sonarsource/sonarqube/perf/MavenLogs.java b/tests/perf/src/main/java/org/sonarsource/sonarqube/perf/MavenLogs.java
index 90960996b8c..90960996b8c 100644
--- a/it/perf-tests/src/main/java/org/sonarsource/sonarqube/perf/MavenLogs.java
+++ b/tests/perf/src/main/java/org/sonarsource/sonarqube/perf/MavenLogs.java
diff --git a/it/perf-tests/src/main/java/org/sonarsource/sonarqube/perf/ServerLogs.java b/tests/perf/src/main/java/org/sonarsource/sonarqube/perf/ServerLogs.java
index 7bf90524153..7bf90524153 100644
--- a/it/perf-tests/src/main/java/org/sonarsource/sonarqube/perf/ServerLogs.java
+++ b/tests/perf/src/main/java/org/sonarsource/sonarqube/perf/ServerLogs.java
diff --git a/it/perf-tests/src/main/resources/selenium/rename_findbugs_profile.html b/tests/perf/src/main/resources/selenium/rename_findbugs_profile.html
index 849f8cb7ec5..849f8cb7ec5 100644
--- a/it/perf-tests/src/main/resources/selenium/rename_findbugs_profile.html
+++ b/tests/perf/src/main/resources/selenium/rename_findbugs_profile.html
diff --git a/it/perf-tests/src/test/java/org/sonarsource/sonarqube/perf/PerfRule.java b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/PerfRule.java
index 4f82a26b097..4f82a26b097 100644
--- a/it/perf-tests/src/test/java/org/sonarsource/sonarqube/perf/PerfRule.java
+++ b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/PerfRule.java
diff --git a/it/perf-tests/src/test/java/org/sonarsource/sonarqube/perf/PerfTestCase.java b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/PerfTestCase.java
index 821cb72ab2b..821cb72ab2b 100644
--- a/it/perf-tests/src/test/java/org/sonarsource/sonarqube/perf/PerfTestCase.java
+++ b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/PerfTestCase.java
diff --git a/it/perf-tests/src/test/java/org/sonarsource/sonarqube/perf/computation/ComputationTest.java b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/computation/ComputationTest.java
index 86d305c6ab5..86d305c6ab5 100644
--- a/it/perf-tests/src/test/java/org/sonarsource/sonarqube/perf/computation/ComputationTest.java
+++ b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/computation/ComputationTest.java
diff --git a/it/perf-tests/src/test/java/org/sonarsource/sonarqube/perf/scanner/IssuesModeBigTest.java b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/IssuesModeBigTest.java
index 61439b62c03..61439b62c03 100644
--- a/it/perf-tests/src/test/java/org/sonarsource/sonarqube/perf/scanner/IssuesModeBigTest.java
+++ b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/IssuesModeBigTest.java
diff --git a/it/perf-tests/src/test/java/org/sonarsource/sonarqube/perf/scanner/MavenLogsTest.java b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/MavenLogsTest.java
index 22f945b98f6..22f945b98f6 100644
--- a/it/perf-tests/src/test/java/org/sonarsource/sonarqube/perf/scanner/MavenLogsTest.java
+++ b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/MavenLogsTest.java
diff --git a/it/perf-tests/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/BootstrappingTest.java b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/BootstrappingTest.java
index c14bf582c33..c14bf582c33 100644
--- a/it/perf-tests/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/BootstrappingTest.java
+++ b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/BootstrappingTest.java
diff --git a/it/perf-tests/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/DuplicationTest.java b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/DuplicationTest.java
index b309b7f5b8f..b309b7f5b8f 100644
--- a/it/perf-tests/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/DuplicationTest.java
+++ b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/DuplicationTest.java
diff --git a/it/perf-tests/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/FileSystemTest.java b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/FileSystemTest.java
index a6c97d0ccee..a6c97d0ccee 100644
--- a/it/perf-tests/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/FileSystemTest.java
+++ b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/FileSystemTest.java
diff --git a/it/perf-tests/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/HighlightingTest.java b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/HighlightingTest.java
index dc963d80364..dc963d80364 100644
--- a/it/perf-tests/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/HighlightingTest.java
+++ b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/HighlightingTest.java
diff --git a/it/perf-tests/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/IssuesModeTest.java b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/IssuesModeTest.java
index 40577235054..40577235054 100644
--- a/it/perf-tests/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/IssuesModeTest.java
+++ b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/IssuesModeTest.java
diff --git a/it/perf-tests/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/MemoryTest.java b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/MemoryTest.java
index 863b1a2bd53..863b1a2bd53 100644
--- a/it/perf-tests/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/MemoryTest.java
+++ b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/MemoryTest.java
diff --git a/it/perf-tests/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/ScannerPerfTestSuite.java b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/ScannerPerfTestSuite.java
index 7365b8f5da9..7365b8f5da9 100644
--- a/it/perf-tests/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/ScannerPerfTestSuite.java
+++ b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/ScannerPerfTestSuite.java
diff --git a/it/perf-tests/src/test/java/org/sonarsource/sonarqube/perf/server/ServerTest.java b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/ServerTest.java
index ac4afed4fe9..ac4afed4fe9 100644
--- a/it/perf-tests/src/test/java/org/sonarsource/sonarqube/perf/server/ServerTest.java
+++ b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/ServerTest.java
diff --git a/it/perf-tests/src/test/java/org/sonarsource/sonarqube/perf/server/WebTest.java b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/WebTest.java
index 27cb04bd407..27cb04bd407 100644
--- a/it/perf-tests/src/test/java/org/sonarsource/sonarqube/perf/server/WebTest.java
+++ b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/WebTest.java
diff --git a/it/perf-tests/src/test/resources/java-quality-profile.xml b/tests/perf/src/test/resources/java-quality-profile.xml
index f9a32d71442..f9a32d71442 100644
--- a/it/perf-tests/src/test/resources/java-quality-profile.xml
+++ b/tests/perf/src/test/resources/java-quality-profile.xml
diff --git a/it/perf-tests/src/test/resources/one-xoo-issue-per-line.xml b/tests/perf/src/test/resources/one-xoo-issue-per-line.xml
index b2f49460d34..b2f49460d34 100644
--- a/it/perf-tests/src/test/resources/one-xoo-issue-per-line.xml
+++ b/tests/perf/src/test/resources/one-xoo-issue-per-line.xml