diff --git a/test/Basic/Makefile b/test/Basic/Makefile
index 9ee2ee8..e6f7068 100644
--- a/test/Basic/Makefile
+++ b/test/Basic/Makefile
@@ -1,36 +1,15 @@
 include ../../Makefile.conf
-
-$(info If on Mac, make sure to disable SIP, or copy the libpEpEngine.dylib into here)
-
-ifdef ENGINE_LIB_PATH
-	ifeq ($(BUILD_FOR),Linux)
-	  ifndef LD_LIBRARY_PATH
-	    export LD_LIBRARY_PATH=$(ENGINE_LIB_PATH)
-	  endif
-	else ifeq ($(BUILD_FOR),Darwin)
-	  ifndef DYLD_LIBRARY_PATH
-	    export DYLD_LIBRARY_PATH=$(ENGINE_LIB_PATH)
-	  endif
-	endif
-endif
-
-CLASSPATH=.:../../src
-VM=java -Xcheck:jni -Djava.library.path=../../src
-#VM=lldb java -- -Xcheck:jni -Djava.library.path=../src
+include ../Makefile.conf
 
 .PHONY: test clean
 
 test: Testing.class SyncCallbacks.class
 	HOME=$(PWD) CLASSPATH=$(CLASSPATH) time $(VM) Testing
 
-test-JNI-85:
-	$(MAKE) -C JNI_85
-
 %.class: %.java
 	CLASSPATH=$(CLASSPATH) javac $<
 
 clean:
-	$(MAKE) -C JNI_85 clean
 	rm -f *.class
 	rm -f *.log
 	rm -f .pEp_*
diff --git a/test/JNI_85/Makefile b/test/JNI_85/Makefile
index 733c3eb..9958ab9 100644
--- a/test/JNI_85/Makefile
+++ b/test/JNI_85/Makefile
@@ -1,13 +1,9 @@
 include ../../Makefile.conf
+include ../Makefile.conf
 
 #TODO: Remove when successufuly reproduce the error, and then use it to avoid regression
 $(info This is to be run using pEpJNIAdapter 626)
 
-
-CLASSPATH=.:../../src
-VM=java -Xcheck:jni -Djava.library.path=../../src
-#VM=lldb java -- -Xcheck:jni -Djava.library.path=../src
-
 .PHONY: test clean
 
 test: SyncCallbacks.class Step1.class Step2.class
diff --git a/test/Makefile.conf b/test/Makefile.conf
new file mode 100644
index 0000000..f6fe398
--- /dev/null
+++ b/test/Makefile.conf
@@ -0,0 +1,18 @@
+$(info If on Mac, make sure to disable SIP, or copy the libpEpEngine.dylib into here)
+
+ifdef ENGINE_LIB_PATH
+	ifeq ($(BUILD_FOR),Linux)
+	  ifndef LD_LIBRARY_PATH
+	    export LD_LIBRARY_PATH=$(ENGINE_LIB_PATH)
+	  endif
+	else ifeq ($(BUILD_FOR),Darwin)
+	  ifndef DYLD_LIBRARY_PATH
+	    export DYLD_LIBRARY_PATH=$(ENGINE_LIB_PATH)
+	  endif
+	endif
+endif
+
+
+CLASSPATH=.:../../src
+VM=java -Xcheck:jni -Djava.library.path=../../src
+#VM=lldb java -- -Xcheck:jni -Djava.library.path=../src