diff --git a/apps/dav/tests/ci/caldav-old-endpoint/install.sh b/apps/dav/tests/ci/caldav-old-endpoint/install.sh
index 4fd32a35817a..e0ac30c9e46b 100644
--- a/apps/dav/tests/ci/caldav-old-endpoint/install.sh
+++ b/apps/dav/tests/ci/caldav-old-endpoint/install.sh
@@ -5,7 +5,7 @@ SCRIPTPATH=`dirname $SCRIPT`
 
 cd "$SCRIPTPATH"
 if [ ! -f CalDAVTester/testcaldav.py ]; then
-    git clone https://github.com/owncloud-ci/ccs-caldavtester.git CalDAVTester
+    git clone https://github.com/apple/ccs-caldavtester.git CalDAVTester
 fi
 if [ ! -f pycalendar/setup.py ]; then
     git clone https://github.com/apple/ccs-pycalendar.git pycalendar
diff --git a/apps/dav/tests/ci/caldav-old-endpoint/script.sh b/apps/dav/tests/ci/caldav-old-endpoint/script.sh
index 3f230d2fa350..6e74c245746c 100644
--- a/apps/dav/tests/ci/caldav-old-endpoint/script.sh
+++ b/apps/dav/tests/ci/caldav-old-endpoint/script.sh
@@ -13,7 +13,7 @@ sleep 30
 
 # run the tests
 cd "$SCRIPTPATH/CalDAVTester"
-PYTHONPATH="$SCRIPTPATH/pycalendar/src" python3 testcaldav.py --print-details-onfail --basedir "$SCRIPTPATH/../caldavtest/" -o cdt.txt \
+PYTHONPATH="$SCRIPTPATH/pycalendar/src" python2 testcaldav.py --print-details-onfail --basedir "$SCRIPTPATH/../caldavtest/" -o cdt.txt \
 	"CalDAV/current-user-principal.xml" \
 	"CalDAV/sync-report.xml"
 
diff --git a/apps/dav/tests/ci/caldav/install.sh b/apps/dav/tests/ci/caldav/install.sh
index 4fd32a35817a..e0ac30c9e46b 100644
--- a/apps/dav/tests/ci/caldav/install.sh
+++ b/apps/dav/tests/ci/caldav/install.sh
@@ -5,7 +5,7 @@ SCRIPTPATH=`dirname $SCRIPT`
 
 cd "$SCRIPTPATH"
 if [ ! -f CalDAVTester/testcaldav.py ]; then
-    git clone https://github.com/owncloud-ci/ccs-caldavtester.git CalDAVTester
+    git clone https://github.com/apple/ccs-caldavtester.git CalDAVTester
 fi
 if [ ! -f pycalendar/setup.py ]; then
     git clone https://github.com/apple/ccs-pycalendar.git pycalendar
diff --git a/apps/dav/tests/ci/caldav/script.sh b/apps/dav/tests/ci/caldav/script.sh
index 6d2cece753e0..b0366ebad596 100644
--- a/apps/dav/tests/ci/caldav/script.sh
+++ b/apps/dav/tests/ci/caldav/script.sh
@@ -9,7 +9,7 @@ sleep 30
 
 # run the tests
 cd "$SCRIPTPATH/CalDAVTester"
-PYTHONPATH="$SCRIPTPATH/pycalendar/src" python3 testcaldav.py --print-details-onfail --basedir "$SCRIPTPATH/../caldavtest/" -o cdt.txt \
+PYTHONPATH="$SCRIPTPATH/pycalendar/src" python2 testcaldav.py --print-details-onfail --basedir "$SCRIPTPATH/../caldavtest/" -o cdt.txt \
 	"CalDAV/current-user-principal.xml" \
 	"CalDAV/sync-report.xml" \
 	"CalDAV/sharing-calendars.xml"
diff --git a/apps/dav/tests/ci/carddav-old-endpoint/install.sh b/apps/dav/tests/ci/carddav-old-endpoint/install.sh
index 9dd0d6d1babe..db8b53bc8617 100644
--- a/apps/dav/tests/ci/carddav-old-endpoint/install.sh
+++ b/apps/dav/tests/ci/carddav-old-endpoint/install.sh
@@ -5,7 +5,7 @@ SCRIPTPATH=`dirname $SCRIPT`
 
 cd "$SCRIPTPATH"
 if [ ! -f CalDAVTester/testcaldav.py ]; then
-    git clone https://github.com/owncloud-ci/ccs-caldavtester.git CalDAVTester
+    git clone https://github.com/apple/ccs-caldavtester.git CalDAVTester
 fi
 if [ ! -f pycalendar/setup.py ]; then
     git clone https://github.com/apple/ccs-pycalendar.git pycalendar
diff --git a/apps/dav/tests/ci/carddav-old-endpoint/script.sh b/apps/dav/tests/ci/carddav-old-endpoint/script.sh
index 1d6c87f3099a..80d1546f59c3 100644
--- a/apps/dav/tests/ci/carddav-old-endpoint/script.sh
+++ b/apps/dav/tests/ci/carddav-old-endpoint/script.sh
@@ -13,7 +13,7 @@ sleep 30
 
 # run the tests
 cd "$SCRIPTPATH/CalDAVTester"
-PYTHONPATH="$SCRIPTPATH/pycalendar/src" python3 testcaldav.py --print-details-onfail --basedir "$SCRIPTPATH/../caldavtest/" -o cdt.txt \
+PYTHONPATH="$SCRIPTPATH/pycalendar/src" python2 testcaldav.py --print-details-onfail --basedir "$SCRIPTPATH/../caldavtest/" -o cdt.txt \
 	"CardDAV/current-user-principal.xml" \
 	"CardDAV/sync-report.xml"
 
diff --git a/apps/dav/tests/ci/carddav/install.sh b/apps/dav/tests/ci/carddav/install.sh
index 9dd0d6d1babe..db8b53bc8617 100644
--- a/apps/dav/tests/ci/carddav/install.sh
+++ b/apps/dav/tests/ci/carddav/install.sh
@@ -5,7 +5,7 @@ SCRIPTPATH=`dirname $SCRIPT`
 
 cd "$SCRIPTPATH"
 if [ ! -f CalDAVTester/testcaldav.py ]; then
-    git clone https://github.com/owncloud-ci/ccs-caldavtester.git CalDAVTester
+    git clone https://github.com/apple/ccs-caldavtester.git CalDAVTester
 fi
 if [ ! -f pycalendar/setup.py ]; then
     git clone https://github.com/apple/ccs-pycalendar.git pycalendar
diff --git a/apps/dav/tests/ci/carddav/script.sh b/apps/dav/tests/ci/carddav/script.sh
index 740b70e2b68f..57ec1c154d30 100644
--- a/apps/dav/tests/ci/carddav/script.sh
+++ b/apps/dav/tests/ci/carddav/script.sh
@@ -9,7 +9,7 @@ sleep 30
 
 # run the tests
 cd "$SCRIPTPATH/CalDAVTester"
-PYTHONPATH="$SCRIPTPATH/pycalendar/src" python3 testcaldav.py --print-details-onfail --basedir "$SCRIPTPATH/../caldavtest/" -o cdt.txt \
+PYTHONPATH="$SCRIPTPATH/pycalendar/src" python2 testcaldav.py --print-details-onfail --basedir "$SCRIPTPATH/../caldavtest/" -o cdt.txt \
 	"CardDAV/current-user-principal.xml" \
 	"CardDAV/sync-report.xml" \
 	"CardDAV/sharing-addressbooks.xml"