--- old/test/TEST.groups	2017-04-28 14:21:57.000000000 -0700
+++ new/test/TEST.groups	2017-04-28 14:21:57.000000000 -0700
@@ -249,8 +249,7 @@
     sun/tools \
     -sun/tools/java \
     -sun/tools/jrunscript \
-    sun/jvmstat \
-    demo/jvmti
+    sun/jvmstat
 
 jdk_tools = \
     :core_tools \