--- a/mx/suite.py	Thu May 28 16:54:14 2015 +0200
+++ b/mx/suite.py	Thu May 28 17:44:05 2015 +0200
@@ -109,36 +109,6 @@
       "sha1" : "59b64c974662b5cf9dbd3cf9045d293853dd7a51",
     },
 
-    "OKRA" : {
-      "path" : "lib/okra-1.10.jar",
-      "urls" : [
-        "http://lafo.ssw.uni-linz.ac.at/graal-external-deps/okra-1.10.jar",
-        "http://cr.openjdk.java.net/~tdeneau/okra-1.10.jar",
-      ],
-      "sha1" : "96eb3c0ec808ed944ba88d1eb9311058fe0f3d1e",
-      "sourcePath" : "lib/okra-1.10-src.jar",
-      "sourceUrls" : [
-        "http://lafo.ssw.uni-linz.ac.at/graal-external-deps/okra-1.10-src.jar",
-        "http://cr.openjdk.java.net/~tdeneau/okra-1.10-src.jar",
-      ],
-      "sourceSha1" : "75751bb148fcebaba78ff590f883a114b2b09176",
-    },
-
-    "OKRA_WITH_SIM" : {
-      "path" : "lib/okra-1.10-with-sim.jar",
-      "urls" : [
-        "http://lafo.ssw.uni-linz.ac.at/graal-external-deps/okra-1.10-with-sim.jar",
-        "http://cr.openjdk.java.net/~tdeneau/okra-1.10-with-sim.jar",
-      ],
-      "sha1" : "7b8db879f1dbcf571290add78d9af24e15a2a50d",
-      "sourcePath" : "lib/okra-1.10-with-sim-src.jar",
-      "sourceSha1" : "7eefd94f16a3e3fd3b8f470cf91e265c6f5e7767",
-      "sourceUrls" : [
-        "http://lafo.ssw.uni-linz.ac.at/graal-external-deps/okra-1.10-with-sim-src.jar",
-        "http://cr.openjdk.java.net/~tdeneau/okra-1.10-with-sim-src.jar",
-      ],
-    },
-
     "JAVA_ALLOCATION_INSTRUMENTER" : {
       "path" : "lib/java-allocation-instrumenter.jar",
       "sourcePath" : "lib/java-allocation-instrumenter.jar",
@@ -397,15 +367,6 @@
       "workingSets" : "Graal,HotSpot,SPARC",
     },
 
-    "com.oracle.graal.hotspot.server" : {
-      "subDir" : "graal",
-      "sourceDirs" : ["src"],
-      "dependencies" : ["com.oracle.graal.hotspot"],
-      "checkstyle" : "com.oracle.graal.graph",
-      "javaCompliance" : "1.8",
-      "workingSets" : "Graal,HotSpot",
-    },
-
     "com.oracle.graal.hotspot.test" : {
       "subDir" : "graal",
       "sourceDirs" : ["src"],
@@ -784,7 +745,7 @@
       "sourceDirs" : ["src"],
       "dependencies" : [
         "com.oracle.graal.amd64",
-        "com.oracle.graal.compiler.test",
+        "com.oracle.graal.lir.jtt",
       ],
       "checkstyle" : "com.oracle.graal.graph",
       "javaCompliance" : "1.8",
@@ -1010,7 +971,7 @@
       "subDir" : "graal",
       "sourceDirs" : ["src"],
       "dependencies" : [
-        "com.oracle.truffle.api.dsl",
+        "com.oracle.truffle.dsl.processor",
         "JUNIT",
       ],
       "checkstyle" : "com.oracle.graal.graph",
@@ -1079,6 +1040,7 @@
       "sourceDirs" : ["src"],
       "dependencies" : [
         "com.oracle.truffle.api.dsl",
+        "com.oracle.truffle.interop",
         "com.oracle.truffle.api.object",
         "FINDBUGS"
       ],
@@ -1092,8 +1054,8 @@
       "subDir" : "graal",
       "sourceDirs" : ["src"],
       "dependencies" : [
-        "com.oracle.truffle.sl",
-        "JUNIT",
+        "com.oracle.truffle.api.test",
+        "com.oracle.truffle.sl"
       ],
       "checkstyle" : "com.oracle.graal.graph",
       "javaCompliance" : "1.8",