diff --git a/irods/test/harness/README.txt b/irods/test/harness/README.txt
index 8b8c32c0c..af158ce07 100644
--- a/irods/test/harness/README.txt
+++ b/irods/test/harness/README.txt
@@ -19,7 +19,7 @@ Examples of options in driver script
 ------------------------------------
 
   1. To start container and run test script:
-     C=$(  ./docker_container_driver.sh -c -L -u testuser  ../pam.bats/experiment.sh )
+     C=$(  ./docker_container_driver.sh -c -L -u testuser  ../scripts/experiment.sh )
 
   2. To manually examine results afterward:
      docker exec -it $C bash 
diff --git a/irods/test/login_auth_test.sh b/irods/test/login_auth_test.sh
new file mode 100644
index 000000000..0f14434a6
--- /dev/null
+++ b/irods/test/login_auth_test.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+. $(dirname $0)/scripts/funcs
diff --git a/irods/test/pam.bats/experiment.sh b/irods/test/scripts/experiment.sh
similarity index 100%
rename from irods/test/pam.bats/experiment.sh
rename to irods/test/scripts/experiment.sh
diff --git a/irods/test/pam.bats/funcs b/irods/test/scripts/funcs
similarity index 100%
rename from irods/test/pam.bats/funcs
rename to irods/test/scripts/funcs
diff --git a/irods/test/pam.bats/test001_pam_password_expiration.bats b/irods/test/scripts/test001_pam_password_expiration.bats
similarity index 100%
rename from irods/test/pam.bats/test001_pam_password_expiration.bats
rename to irods/test/scripts/test001_pam_password_expiration.bats