diff --git a/Makefile b/Makefile
index 2b0052f1ca8c38ef3dd742253504eecd6ecc0c46..0e7a457bbdb5154e3815c56483eab23977d0bdc8 100644
--- a/Makefile
+++ b/Makefile
@@ -116,16 +116,11 @@ phpunit:
 	# update composer with dev to install phpunit package
 	cd extension; composer update
 
-	# create deprecated test config files and get test database password from environment variable
-	# cp -v extension/Tests/phpunit_config.qfq.php extension/config.qfq.php; sed -i "s/#PHPUNIT_PASSWORD#/$(PHPUNIT_MYSQL_PASSWORD)/" extension/config.qfq.php
-	# cp -v extension/Tests/phpunit_LocalConfiguration.php extension/LocalConfiguration.php
-
 	# mock typo3 directory structure
 	mkdir -p  typo3conf/ext/qfq
 	mv -v extension/* typo3conf/ext/qfq/
 
     # create new kind of config (qfq.json)
-	# cp -v typo3conf/ext/qfq/Tests/phpunit_qfq.json typo3conf/ext/qfq.json; sed -i "s/#PHPUNIT_PASSWORD#/$(PHPUNIT_MYSQL_PASSWORD)/" typo3conf/ext/qfq.json
 	cp -v typo3conf/ext/qfq/Tests/phpunit_qfq.json ../qfq.json; sed -i "s/#PHPUNIT_PASSWORD#/$(PHPUNIT_MYSQL_PASSWORD)/" ../qfq.json
 	cp -v typo3conf/ext/qfq/Tests/phpunit_LocalConfiguration.php typo3conf/LocalConfiguration.php
 
diff --git a/extension/Tests/selenium/qfqselenium.py b/extension/Tests/selenium/qfqselenium.py
index fcdf724d7acd3596b998b7e1906ebc46e56ad932..7c6dcb1a941654d3b3f7347a6475e1eadf5b5240 100644
--- a/extension/Tests/selenium/qfqselenium.py
+++ b/extension/Tests/selenium/qfqselenium.py
@@ -112,6 +112,9 @@ class QfqSeleniumTestCase(unittest.TestCase):
         cls.driver.set_window_size(1920, 1080)
         cls.driver.implicitly_wait(5)
 
+    def __init__(self, *args, **kwargs):
+        super(QfqSeleniumTestCase, self).__init__()
+
     @classmethod
     def tearDownClass(cls):
         """