diff -r 71c04702a3d5 -r 72e3ae9a25eb make/test/JtregNativeJdk.gmk
--- a/make/test/JtregNativeJdk.gmk	Tue Sep 12 19:03:39 2017 +0200
+++ b/make/test/JtregNativeJdk.gmk	Tue Sep 12 19:03:56 2017 +0200
@@ -35,7 +35,7 @@
 include MakeBase.gmk
 include TestFilesCompilation.gmk
 
-$(eval $(call IncludeCustomExtension, jdk, test/JtregNative.gmk))
+$(eval $(call IncludeCustomExtension, , test/JtregNative.gmk))
 
 ################################################################################
 # Targets for building the native tests themselves.
@@ -43,8 +43,8 @@
 
 # Add more directories here when needed.
 BUILD_JDK_JTREG_NATIVE_SRC += \
-    $(JDK_TOPDIR)/test/native_sanity \
-    $(JDK_TOPDIR)/test/java/lang/String/nativeEncoding \
+    $(TOPDIR)/test/jdk/native_sanity \
+    $(TOPDIR)/test/jdk/java/lang/String/nativeEncoding \
     #
 
 BUILD_JDK_JTREG_OUTPUT_DIR := $(BUILD_OUTPUT)/support/test/jdk/jtreg/native