2 files changed, 8 insertions, 5 deletions
diff --git a/it/src/test/java/com/sonarsource/scanner/it/ScannerTestCase.java b/it/src/test/java/com/sonarsource/scanner/it/ScannerTestCase.java
index 906368e..840420e 100644
--- a/it/src/test/java/com/sonarsource/scanner/it/ScannerTestCase.java
+++ b/it/src/test/java/com/sonarsource/scanner/it/ScannerTestCase.java
@@ -22,6 +22,7 @@ package com.sonarsource.scanner.it;
 import com.sonar.orchestrator.Orchestrator;
 import com.sonar.orchestrator.build.SonarScanner;
 import com.sonar.orchestrator.http.HttpMethod;
+import com.sonar.orchestrator.junit4.OrchestratorRule;
 import com.sonar.orchestrator.version.Version;
 import java.io.File;
 import java.io.FileInputStream;
@@ -66,7 +67,7 @@ public abstract class ScannerTestCase {
   public ExpectedException thrown = ExpectedException.none();
 
   @ClassRule
-  public static Orchestrator orchestrator = SonarScannerTestSuite.ORCHESTRATOR;
+  public static OrchestratorRule orchestrator = SonarScannerTestSuite.ORCHESTRATOR;
 
   private static Version artifactVersion;
 
diff --git a/it/src/test/java/com/sonarsource/scanner/it/SonarScannerTestSuite.java b/it/src/test/java/com/sonarsource/scanner/it/SonarScannerTestSuite.java
index fbaa5b8..ebb4aed 100644
--- a/it/src/test/java/com/sonarsource/scanner/it/SonarScannerTestSuite.java
+++ b/it/src/test/java/com/sonarsource/scanner/it/SonarScannerTestSuite.java
@@ -20,6 +20,8 @@
 package com.sonarsource.scanner.it;
 
 import com.sonar.orchestrator.Orchestrator;
+import com.sonar.orchestrator.OrchestratorBuilder;
+import com.sonar.orchestrator.junit4.OrchestratorRule;
 import com.sonar.orchestrator.locator.MavenLocation;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
@@ -32,15 +34,15 @@ import org.junit.runners.Suite.SuiteClasses;
 public class SonarScannerTestSuite {
 
   @ClassRule
-  public static final Orchestrator ORCHESTRATOR = createOrchestrator();
+  public static final OrchestratorRule ORCHESTRATOR = createOrchestrator();
 
-  private static Orchestrator createOrchestrator() {
+  private static OrchestratorRule createOrchestrator() {
     String sonarVersion = System
       .getProperty("sonar.runtimeVersion", "LATEST_RELEASE[9.9]");
-    return Orchestrator.builderEnv()
+    return OrchestratorRule.builderEnv()
       .useDefaultAdminCredentialsForBuilds(true)
       .setSonarVersion(sonarVersion)
-      .keepBundledPlugins()
+      .addBundledPluginToKeep("sonar-javascript")
       .addPlugin(MavenLocation.of("org.sonarsource.sonarqube", "sonar-xoo-plugin", sonarVersion))
       .build();
   }