diff --git a/tests/httpd-php-mysql-sanity-test/Makefile b/tests/httpd-php-mysql-sanity-test/Makefile
index 17fb9d3..a688236 100644
--- a/tests/httpd-php-mysql-sanity-test/Makefile
+++ b/tests/httpd-php-mysql-sanity-test/Makefile
@@ -29,7 +29,7 @@ export TESTVERSION=1.0
 
 BUILT_FILES=
 
-FILES=$(METADATA) runtest.sh Makefile PURPOSE mysql.php php_mysql_test.sql php_mysql_test.conf
+FILES=$(METADATA) runtest.sh Makefile PURPOSE new_mysql.php old_mysql.php php_mysql_test.sql php_mysql_test.conf
 
 .PHONY: all install download clean
 
diff --git a/tests/httpd-php-mysql-sanity-test/runtest.sh b/tests/httpd-php-mysql-sanity-test/runtest.sh
index e2239ad..6fa8315 100755
--- a/tests/httpd-php-mysql-sanity-test/runtest.sh
+++ b/tests/httpd-php-mysql-sanity-test/runtest.sh
@@ -57,7 +57,7 @@ rlJournalStart
         rlRun "rm -rvf $httpROOTDIR/php_mysql_test"
         rlRun "mkdir -v $httpROOTDIR/php_mysql_test"
         rlRun "cp -v php_mysql_test.conf $httpCONFDIR/conf.d/"
-        rlRun "php_version=`rlCheckRpm php`"
+        php_version=`rlCheckRpm php`
         if [[ $php_version =~ php-7* ]] || [[ $php_version =~ php-5.[5-6]* ]]; then
             rlRun "cp -v new_mysql.php $httpROOTDIR/php_mysql_test/mysql.php"
         else
diff --git a/tests/tests.yml b/tests/tests.yml
index 43c38e7..e0ef0be 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -1,13 +1,10 @@
 ---
 # Tests that run in all contexts
 - hosts: localhost
-  vars:
-    use_beakerlib_libraries: true
   roles:
-  - role: standard-test-rhts
+  - role: standard-test-beakerlib
     tags:
     - classic
-    - container
     tests:
     - httpd-php-mysql-sanity-test
     required_packages: