--- a/jdk/test/TEST.groups	Mon Jul 13 15:35:57 2015 +0200
+++ b/jdk/test/TEST.groups	Wed Jul 15 13:21:25 2015 +0200
@@ -223,7 +223,8 @@
     sun/tools \
     -sun/tools/java \
     -sun/tools/jrunscript \
-    sun/jvmstat
+    sun/jvmstat \
+    demo/jvmti
 
 jdk_tools = \
     :core_tools \
@@ -434,6 +435,7 @@
 needs_jdk = \
   :jdk_jdi \
   com/sun/tools \
+  demo \
   sun/security/tools/jarsigner \
   sun/security/tools/policytool \
   sun/rmi/rmic \