diff -r 71c04702a3d5 -r 72e3ae9a25eb make/test/JtregNativeHotspot.gmk
--- a/make/test/JtregNativeHotspot.gmk	Tue Sep 12 19:03:39 2017 +0200
+++ b/make/test/JtregNativeHotspot.gmk	Tue Sep 12 19:03:56 2017 +0200
@@ -35,7 +35,7 @@
 include MakeBase.gmk
 include TestFilesCompilation.gmk
 
-$(eval $(call IncludeCustomExtension, hotspot, test/JtregNative.gmk))
+$(eval $(call IncludeCustomExtension, , hotspot/test/JtregNative.gmk))
 
 ################################################################################
 # Targets for building the native tests themselves.
@@ -43,51 +43,51 @@
 
 # Add more directories here when needed.
 BUILD_HOTSPOT_JTREG_NATIVE_SRC += \
-    $(HOTSPOT_TOPDIR)/test/gc/g1/TestJNIWeakG1 \
-    $(HOTSPOT_TOPDIR)/test/gc/stress/gclocker \
-    $(HOTSPOT_TOPDIR)/test/gc/cslocker \
-    $(HOTSPOT_TOPDIR)/test/native_sanity \
-    $(HOTSPOT_TOPDIR)/test/runtime/jni/8025979 \
-    $(HOTSPOT_TOPDIR)/test/runtime/jni/8033445 \
-    $(HOTSPOT_TOPDIR)/test/runtime/jni/checked \
-    $(HOTSPOT_TOPDIR)/test/runtime/jni/PrivateInterfaceMethods \
-    $(HOTSPOT_TOPDIR)/test/runtime/jni/ToStringInInterfaceTest \
-    $(HOTSPOT_TOPDIR)/test/runtime/jni/CalleeSavedRegisters \
-    $(HOTSPOT_TOPDIR)/test/runtime/jni/CallWithJNIWeak \
-    $(HOTSPOT_TOPDIR)/test/runtime/jni/ReturnJNIWeak \
-    $(HOTSPOT_TOPDIR)/test/runtime/modules/getModuleJNI \
-    $(HOTSPOT_TOPDIR)/test/runtime/SameObject \
-    $(HOTSPOT_TOPDIR)/test/runtime/BoolReturn \
-    $(HOTSPOT_TOPDIR)/test/runtime/noClassDefFoundMsg \
-    $(HOTSPOT_TOPDIR)/test/compiler/floatingpoint/ \
-    $(HOTSPOT_TOPDIR)/test/compiler/calls \
-    $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/GetOwnedMonitorInfo \
-    $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/GetNamedModule \
-    $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/IsModifiableModule \
-    $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/AddModuleReads \
-    $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/AddModuleExportsAndOpens \
-    $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/AddModuleUsesAndProvides \
-    $(HOTSPOT_TOPDIR)/test/testlibrary/jvmti \
-    $(HOTSPOT_TOPDIR)/test/compiler/jvmci/jdk.vm.ci.code.test \
-    $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/GetModulesInfo \
-    $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/ModuleAwareAgents/ClassFileLoadHook \
-    $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/ModuleAwareAgents/ClassLoadPrepare \
-    $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/ModuleAwareAgents/ThreadStart \
-    $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/StartPhase/AllowedFunctions \
+    $(TOPDIR)/test/hotspot/jtreg/gc/g1/TestJNIWeakG1 \
+    $(TOPDIR)/test/hotspot/jtreg/gc/stress/gclocker \
+    $(TOPDIR)/test/hotspot/jtreg/gc/cslocker \
+    $(TOPDIR)/test/hotspot/jtreg/native_sanity \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/jni/8025979 \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/jni/8033445 \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/jni/checked \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/jni/PrivateInterfaceMethods \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/jni/ToStringInInterfaceTest \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/jni/CalleeSavedRegisters \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/jni/CallWithJNIWeak \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/jni/ReturnJNIWeak \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/modules/getModuleJNI \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/SameObject \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/BoolReturn \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/noClassDefFoundMsg \
+    $(TOPDIR)/test/hotspot/jtreg/compiler/floatingpoint/ \
+    $(TOPDIR)/test/hotspot/jtreg/compiler/calls \
+    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorInfo \
+    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/GetNamedModule \
+    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/IsModifiableModule \
+    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/AddModuleReads \
+    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/AddModuleExportsAndOpens \
+    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/AddModuleUsesAndProvides \
+    $(TOPDIR)/test/hotspot/jtreg/testlibrary/jvmti \
+    $(TOPDIR)/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test \
+    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/GetModulesInfo \
+    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/ModuleAwareAgents/ClassFileLoadHook \
+    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/ModuleAwareAgents/ClassLoadPrepare \
+    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/ModuleAwareAgents/ThreadStart \
+    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/StartPhase/AllowedFunctions \
     #
 
 # Add conditional directories here when needed.
 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
 BUILD_HOTSPOT_JTREG_NATIVE_SRC += \
-    $(HOTSPOT_TOPDIR)/test/runtime/libadimalloc.solaris.sparc \
-    $(HOTSPOT_TOPDIR)/test/runtime/ThreadSignalMask
+    $(TOPDIR)/test/hotspot/jtreg/runtime/libadimalloc.solaris.sparc \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/ThreadSignalMask
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), linux)
 BUILD_HOTSPOT_JTREG_NATIVE_SRC += \
-    $(HOTSPOT_TOPDIR)/test/runtime/execstack \
-    $(HOTSPOT_TOPDIR)/test/runtime/jsig \
-    $(HOTSPOT_TOPDIR)/test/runtime/StackGuardPages
+    $(TOPDIR)/test/hotspot/jtreg/runtime/execstack \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/jsig \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/StackGuardPages
 endif
 
 ifeq ($(TOOLCHAIN_TYPE), solstudio)