diff --git a/.gitignore b/.gitignore
index 9835628..532eb5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,6 @@
 /composer.lock
 /vendor
 /testreports
-/tests/interop/AccountData.php
+/tests/Interop/AccountData.php
 /xml
 /doc/api
diff --git a/Makefile b/Makefile
index f5a2e1a..bc69e57 100644
--- a/Makefile
+++ b/Makefile
@@ -13,31 +13,31 @@ stylecheck:
 phpcompatcheck:
 	vendor/bin/phpcs --colors --standard=PHPCompatibility --runtime-set testVersion 7.1 src/ tests/
 
-psalmanalysis: tests/interop/AccountData.php
+psalmanalysis: tests/Interop/AccountData.php
 	vendor/bin/psalm --no-cache --shepherd --report=testreports/psalm.txt --report-show-info=true --no-progress
 
 tests: tests-interop unittests
 	vendor/bin/phpcov merge --html testreports/coverage testreports
 
 .PHONY: unittests
-unittests: tests/unit/phpunit.xml
+unittests: tests/Unit/phpunit.xml
 	@echo
 	@echo  ==========================================================
 	@echo "                   EXECUTING UNIT TESTS"
 	@echo  ==========================================================
 	@echo
 	@mkdir -p testreports/unit
-	vendor/bin/phpunit -c tests/unit/phpunit.xml
+	vendor/bin/phpunit -c tests/Unit/phpunit.xml
 
 .PHONY: tests-interop
-tests-interop: tests/interop/phpunit.xml tests/interop/AccountData.php
+tests-interop: tests/Interop/phpunit.xml tests/Interop/AccountData.php
 	@echo
 	@echo  ==========================================================
 	@echo "       EXECUTING CARDDAV INTEROPERABILITY TESTS"
 	@echo  ==========================================================
 	@echo
 	@mkdir -p testreports/interop
-	vendor/bin/phpunit -c tests/interop/phpunit.xml
+	vendor/bin/phpunit -c tests/Interop/phpunit.xml
 
 doc:
 	rm -rf $(DOCDIR)
@@ -45,7 +45,7 @@ doc:
 	[ -d ../carddavclient-pages ] && rsync -r --delete --exclude .git doc/api/ ../carddavclient-pages
 
 # For github CI system - if AccountData.php is not available, create from AccountData.php.dist
-tests/interop/AccountData.php: | tests/interop/AccountData.php.dist
+tests/Interop/AccountData.php: | tests/Interop/AccountData.php.dist
 	cp $| $@
 
 .PHONY: codecov-upload
diff --git a/psalm.xml b/psalm.xml
index e38d97e..f75a65d 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -17,7 +17,7 @@
         <directory name="tests/"/>
         <file name="doc/quickstart.php"/>
         <ignoreFiles allowMissingFiles="true">
-            <file name="tests/interop/AccountData-*.php" />
+            <file name="tests/Interop/AccountData-*.php" />
         </ignoreFiles>
     </projectFiles>