diff --git a/tests/php-unit-tests/src/BaseTestCase/ItopCustomDatamodelTestCase.php b/tests/php-unit-tests/src/BaseTestCase/ItopCustomDatamodelTestCase.php
index c50335f07..f7bfd7369 100644
--- a/tests/php-unit-tests/src/BaseTestCase/ItopCustomDatamodelTestCase.php
+++ b/tests/php-unit-tests/src/BaseTestCase/ItopCustomDatamodelTestCase.php
@@ -137,7 +137,6 @@ abstract class ItopCustomDatamodelTestCase extends ItopDataTestCase
 			$sConfFile = utils::GetConfigFilePath($sTestEnv);
 			$sConfFolder = dirname($sConfFile);
 			if (is_file($sConfFile)) {
-				chmod($sConfFile, 0777);
 				SetupUtils::tidydir($sConfFolder);
 			}
 
diff --git a/tests/php-unit-tests/src/Service/UnitTestRunTimeEnvironment.php b/tests/php-unit-tests/src/Service/UnitTestRunTimeEnvironment.php
index f630e1827..7cbe20215 100644
--- a/tests/php-unit-tests/src/Service/UnitTestRunTimeEnvironment.php
+++ b/tests/php-unit-tests/src/Service/UnitTestRunTimeEnvironment.php
@@ -129,6 +129,10 @@ class UnitTestRunTimeEnvironment extends RunTimeEnvironment
 				if ($sClass === '') {
 					continue;
 				}
+				if (class_exists($sClass)) {
+					echo "class $sClass already loaded somehow \n";
+					continue;
+				}
                 require_once $sFile;
 				$oReflectionClass = new ReflectionClass($sClass);
 				if ($oReflectionClass->isAbstract()) {