diff --git a/test/test_ctatools.sh b/test/test_ctatools.sh
index 8fa0985..edee9f8 100755
--- a/test/test_ctatools.sh
+++ b/test/test_ctatools.sh
@@ -2,11 +2,6 @@
 #
 # ctatools test script
 # ====================================================================
-PFILES=$PWD/../src/ctobssim
-PFILES=$PWD/../src/ctbin:$PFILES
-PFILES=$PWD/../src/ctselect:$PFILES
-PFILES=$PWD/../src/ctlike:$PFILES
-export PFILES
 
 #
 # Print Header
@@ -23,6 +18,13 @@ rm -rf *.fits *.log *.xml
 
 
 #
+# Creates pfiles directory
+# ========================
+mkdir -p pfiles
+cp -r ../src/*/*.par pfiles/
+export PFILES=pfiles
+
+#
 # Test ctobssim
 # ============
 echo -n "Test ctobssim: "
diff --git a/test/test_python.py b/test/test_python.py
index 6be98ce..240ef36 100755
--- a/test/test_python.py
+++ b/test/test_python.py
@@ -169,11 +169,12 @@ if __name__ == '__main__':
 	print "************************************"
 	
 	# Set PFILES environment variable
-	pfiles  = "../src/ctobssim:"
-	pfiles += "../src/ctbin:"
-	pfiles += "../src/ctselect:"
-	pfiles += "../src/ctlike:"
-	os.environ['PFILES'] = pfiles
+	try:
+		os.mkdir("pfiles")
+	except:
+		pass
+	os.system("cp -r ../src/*/*.par pfiles/")
+	os.environ['PFILES'] = "pfiles"
 	
 	# Remove any existing result files
 	list = [glob.glob("*.fits"), glob.glob("*.log"), glob.glob("*.xml")]