--- old/make/test/JtregNative.gmk	2017-05-17 16:11:03.000000000 +0100
+++ new/make/test/JtregNative.gmk	2017-05-17 16:11:03.000000000 +0100
@@ -42,8 +42,13 @@
 # Add more directories here when needed.
 BUILD_JDK_JTREG_NATIVE_SRC := \
     $(JDK_TOPDIR)/test/native_sanity \
+    $(JDK_TOPDIR)/test/java/lang/System \
     #
 
+ifeq ($(TOOLCHAIN_TYPE), solstudio)
+    BUILD_JDK_JTREG_LIBRARIES_LDFLAGS_librefreshEnv := -lc
+endif
+
 BUILD_JDK_JTREG_OUTPUT_DIR := $(BUILD_OUTPUT)/support/test/jdk/jtreg/native
 
 BUILD_JDK_JTREG_IMAGE_DIR := $(TEST_IMAGE_DIR)/jdk/jtreg