diff --git a/tests/org.eclipse.rap.addons.autosuggest.test/jasmine/jasmine/AutoSuggestJs_Test.java b/tests/org.eclipse.rap.addons.autosuggest.test/jasmine/jasmine/AutoSuggestJs_Test.java
index 0c4d22d..50197f3 100644
--- a/tests/org.eclipse.rap.addons.autosuggest.test/jasmine/jasmine/AutoSuggestJs_Test.java
+++ b/tests/org.eclipse.rap.addons.autosuggest.test/jasmine/jasmine/AutoSuggestJs_Test.java
@@ -19,7 +19,7 @@
 public class AutoSuggestJs_Test {
 
   private static final ClassLoader LOCAL = AutoSuggestJs_Test.class.getClassLoader();
-  private static final ClassLoader CLIENTSCRIPTING = ClientListener.class.getClassLoader();
+  private static final ClassLoader SCRIPTING = ClientListener.class.getClassLoader();
   private static final String AUTO_SUGGEST_JS
     = "org/eclipse/rap/addons/autosuggest/internal/resources/AutoSuggest.js";
 
@@ -42,8 +42,8 @@
   @Test
   public void testListenerSpec() {
     jasmine.addResource( "AutoSuggest.js", LOCAL, AUTO_SUGGEST_JS );
-    jasmine.parseScript( CLIENTSCRIPTING, "rwt/scripting/SWT.js" );
-    jasmine.parseScript( CLIENTSCRIPTING, "rwt/scripting/FunctionFactory.js" );
+    jasmine.parseScript( SCRIPTING, "SWT.js" );
+    jasmine.parseScript( SCRIPTING, "rwt/scripting/FunctionFactory.js" );
     jasmine.parseScript( LOCAL, "jasmine/specs/AutoSuggestSpec.js" );
     jasmine.execute();
   }
diff --git a/tests/org.eclipse.rap.addons.autosuggest.test/jasmine/jasmine/index.html b/tests/org.eclipse.rap.addons.autosuggest.test/jasmine/jasmine/index.html
index 7727e50..1431cdd 100644
--- a/tests/org.eclipse.rap.addons.autosuggest.test/jasmine/jasmine/index.html
+++ b/tests/org.eclipse.rap.addons.autosuggest.test/jasmine/jasmine/index.html
@@ -6,8 +6,8 @@
   <script type="text/javascript" src="fixture/rwt-mock.js"></script>
   <script type="text/javascript" src="fixture/rap-mock.js"></script>
   <script type="text/javascript" src="../../../../bundles/org.eclipse.rap.addons.autosuggest/js/rwt/remote/Model.js"></script>
-  <script type="text/javascript" src="../../../../../org.eclipse.rap.incubator.clientscripting/bundles/org.eclipse.rap.clientscripting/js/rwt/scripting/SWT.js"></script>
-  <script type="text/javascript" src="../../../../../org.eclipse.rap.incubator.clientscripting/bundles/org.eclipse.rap.clientscripting/js/rwt/scripting/FunctionFactory.js"></script>
+  <script type="text/javascript" src="../../../../../org.eclipse.rap/bundles/org.eclipse.rap.rwt/js/SWT.js"></script>
+  <script type="text/javascript" src="../../../../../org.eclipse.rap/bundles/org.eclipse.rap.rwt/js/rwt/scripting/FunctionFactory.js"></script>
   <script type="text/javascript" src="specs/ModelSpec.js"></script>
   <script type="text/javascript" src="specs/AutoSuggestSpec.js"></script>
   <script type="text/javascript">