diff -r 7a5da9274448 -r 642909796280 jdk/test/TEST.groups
--- a/jdk/test/TEST.groups	Thu Jul 09 22:46:18 2015 -0700
+++ b/jdk/test/TEST.groups	Fri Jul 10 14:48:13 2015 +0200
@@ -223,8 +223,7 @@
     sun/tools \
     -sun/tools/java \
     -sun/tools/jrunscript \
-    sun/jvmstat \
-    demo/jvmti
+    sun/jvmstat
 
 jdk_tools = \
     :core_tools \
@@ -435,7 +434,6 @@
 needs_jdk = \
   :jdk_jdi \
   com/sun/tools \
-  demo \
   sun/security/tools/jarsigner \
   sun/security/tools/policytool \
   sun/rmi/rmic \