diff --git a/autotest.cmd b/autotest.cmd
index 0bff45ef379dbd653a417a7acdf59a3b00f8f359..2129e2d30d650be37125f07c42cf9a1c694b13d6 100644
--- a/autotest.cmd
+++ b/autotest.cmd
@@ -67,11 +67,18 @@ echo ^)^;                                        >> .\tests\autoconfig-mssql.php
 
 echo localhost:5432:*:oc_autotest:owncloud > %APPDATA%\postgresql\pgpass.conf
 
+@echo on
+
+:: Back up existing (dev) config if one exists
+if exist config\config.php (
+	copy /y config\config.php config\config-autotest-backup.php
+)
+
 ::
 :: start test execution
 ::
 if [%1] == [] (
-	echo "Running on all database backends"
+	@echo "Running on all database backends"
 	call:execute_tests "sqlite" "%2"
 	call:execute_tests "mysql" "%2"
 	call:execute_tests "mssql" "%2"
@@ -81,11 +88,18 @@ if [%1] == [] (
 	call:execute_tests "%1" "%2"
 )
 
+goto:restore_config
+
 goto:eof
 
-:execute_tests
-	@echo on
+:restore_config
+	:: Restore existing config
+	if exist config\config-autotest-backup.php (
+		copy /y config\config-autotest-backup.php config\config.php
+	)
+goto:eof
 
+:execute_tests
 	@echo "Setup environment for %~1 testing ..."
 	:: back to root folder
 	cd %BASEDIR%