diff --git a/settings.mk b/settings.mk
index 5dc47a02..e7b8e8ae 100644
--- a/settings.mk
+++ b/settings.mk
@@ -315,17 +315,17 @@ TEST_SKIP_STATUS=$@_SKIPPED
 #######################################
 # TEST_SETUP
 #######################################
-TEST_SETUP=export TMPDIR=$$(mktemp /tmp/job-XXX)
+TEST_SETUP=$(ECHO) "Nothing to be done for setup."
 ifeq ($(JDK_IMPL), $(filter $(JDK_IMPL),openj9 ibm))
-	TEST_SETUP+=;$(JAVA_COMMAND) -Xshareclasses:destroyAll; $(JAVA_COMMAND) -Xshareclasses:groupAccess,destroyAll; echo "cache cleanup done"
+	TEST_SETUP=$(JAVA_COMMAND) -Xshareclasses:destroyAll; $(JAVA_COMMAND) -Xshareclasses:groupAccess,destroyAll; echo "cache cleanup done"
 endif
 
 #######################################
 # TEST_TEARDOWN
 #######################################
-TEST_TEARDOWN=rm -rf $$TMPDIR
+TEST_TEARDOWN=$(ECHO) "Nothing to be done for teardown."
 ifeq ($(JDK_IMPL), $(filter $(JDK_IMPL),openj9 ibm))
-	TEST_TEARDOWN+=;$(JAVA_COMMAND) -Xshareclasses:destroyAll; $(JAVA_COMMAND) -Xshareclasses:groupAccess,destroyAll; echo "cache cleanup done"
+	TEST_TEARDOWN=$(JAVA_COMMAND) -Xshareclasses:destroyAll; $(JAVA_COMMAND) -Xshareclasses:groupAccess,destroyAll; echo "cache cleanup done"
 endif
 
 #######################################