--- a/test/hotspot/jtreg/TEST.groups	Wed May 30 14:55:50 2018 -0700
+++ b/test/hotspot/jtreg/TEST.groups	Wed May 30 16:18:56 2018 -0700
@@ -1870,6 +1870,10 @@
   vmTestbase/heapdump/JMapHeapCore/TestDescription.java \
   vmTestbase/heapdump/JMapMetaspace/TestDescription.java
 
+# Tests for attach-on-demand implementation
+vmTestbase_nsk_aod = \
+  vmTestbase/nsk/aod
+
 # JDB tests
 vmTestbase_nsk_jdb = \
   vmTestbase/nsk/jdb