diff --git a/schutzbot/Jenkinsfile b/schutzbot/Jenkinsfile
index 1b88bb7d9..ec6cd20fa 100644
--- a/schutzbot/Jenkinsfile
+++ b/schutzbot/Jenkinsfile
@@ -131,7 +131,7 @@ pipeline {
                         TEST_TYPE = "image"
                         AWS_CREDS = credentials('aws-credentials-osbuildci')
                         AZURE_CREDS = credentials('azure')
-                        OPENSTACK_CREDS = credentials("psi-openstack-clouds-yaml")
+                        OPENSTACK_CREDS = credentials("psi-openstack-creds")
                     }
                     steps {
                         unstash 'fedora31'
@@ -179,7 +179,7 @@ pipeline {
                         TEST_TYPE = "image"
                         AWS_CREDS = credentials('aws-credentials-osbuildci')
                         AZURE_CREDS = credentials('azure')
-                        OPENSTACK_CREDS = credentials("psi-openstack-clouds-yaml")
+                        OPENSTACK_CREDS = credentials("psi-openstack-creds")
                     }
                     steps {
                         unstash 'fedora32'
@@ -230,7 +230,7 @@ pipeline {
                         TEST_TYPE = "image"
                         AWS_CREDS = credentials('aws-credentials-osbuildci')
                         AZURE_CREDS = credentials('azure')
-                        OPENSTACK_CREDS = credentials("psi-openstack-clouds-yaml")
+                        OPENSTACK_CREDS = credentials("psi-openstack-creds")
                         RHN_REGISTRATION_SCRIPT = credentials('rhn-register-script-production')
                     }
                     steps {
@@ -283,7 +283,7 @@ pipeline {
                         TEST_TYPE = "image"
                         AWS_CREDS = credentials('aws-credentials-osbuildci')
                         AZURE_CREDS = credentials('azure')
-                        OPENSTACK_CREDS = credentials("psi-openstack-clouds-yaml")
+                        OPENSTACK_CREDS = credentials("psi-openstack-creds")
                         RHN_REGISTRATION_SCRIPT = credentials('rhn-register-script-production-beta')
                     }
                     steps {
diff --git a/schutzbot/run_image_tests.sh b/schutzbot/run_image_tests.sh
index 8412dabcb..febc7e163 100755
--- a/schutzbot/run_image_tests.sh
+++ b/schutzbot/run_image_tests.sh
@@ -56,7 +56,8 @@ run_test_case () {
     # support aarch64), therefore the following line sets AZURE_CREDS to
     # /dev/null if the variable is undefined.
     AZURE_CREDS=${AZURE_CREDS-/dev/null}
-    TEST_CMD="env $(cat $AZURE_CREDS) $TEST_RUNNER -test.v ${IMAGE_TEST_CASES_PATH}/${TEST_CASE_FILENAME}"
+    OPENSTACK_CREDS=${OPENSTACK_CREDS-/dev/null}
+    TEST_CMD="env $(cat $AZURE_CREDS $OPENSTACK_CREDS) $TEST_RUNNER -test.v ${IMAGE_TEST_CASES_PATH}/${TEST_CASE_FILENAME}"
 
     # Run the test and add the test name to the list of passed or failed
     # tests depending on the result.
@@ -75,10 +76,6 @@ if ! rpm -qi osbuild-composer-tests > /dev/null 2>&1; then
     sudo dnf -y install osbuild-composer-tests
 fi
 
-# Prepare the OpenStack login credentials.
-mkdir -p ~/.config/openstack
-cp $OPENSTACK_CREDS ~/.config/openstack/clouds.yaml
-
 # Change to the working directory.
 cd $WORKING_DIRECTORY