diff --git a/.appveyor.yml b/.appveyor.yml
index 674ebe8d7..197898ad9 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -16,63 +16,99 @@ environment:
     - PHP_REL: 7.3
       ARCHITECTURE: x64
       ZTS_STATE: enable
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       PHP_BUILD_CRT: vc15
-    - PHP_REL: 7.2
-      ARCHITECTURE: x64
-      ZTS_STATE: enable
+      OPCACHE: yes
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      PHP_BUILD_CRT: vc15
-    - PHP_REL: 7.1
-      ARCHITECTURE: x64
-      ZTS_STATE: enable
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      PHP_BUILD_CRT: vc14
     - PHP_REL: 7.3
       ARCHITECTURE: x64
       ZTS_STATE: disable
+      PHP_BUILD_CRT: vc15
+      OPCACHE: yes
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    - PHP_REL: 7.3
+      ARCHITECTURE: x64
+      ZTS_STATE: enable
       PHP_BUILD_CRT: vc15
-    - PHP_REL: 7.2
+      OPCACHE: no
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    - PHP_REL: 7.3
       ARCHITECTURE: x64
       ZTS_STATE: disable
+      PHP_BUILD_CRT: vc15
+      OPCACHE: no
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    - PHP_REL: 7.3
+      ARCHITECTURE: x86
+      ZTS_STATE: enable
       PHP_BUILD_CRT: vc15
-    - PHP_REL: 7.1
-      ARCHITECTURE: x64
+      OPCACHE: yes
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    - PHP_REL: 7.3
+      ARCHITECTURE: x86
       ZTS_STATE: disable
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      PHP_BUILD_CRT: vc14
+      PHP_BUILD_CRT: vc15
+      OPCACHE: yes
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     - PHP_REL: 7.3
       ARCHITECTURE: x86
       ZTS_STATE: enable
+      PHP_BUILD_CRT: vc15
+      OPCACHE: no
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    - PHP_REL: 7.3
+      ARCHITECTURE: x86
+      ZTS_STATE: disable
       PHP_BUILD_CRT: vc15
+      OPCACHE: no
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     - PHP_REL: 7.2
-      ARCHITECTURE: x86
+      ARCHITECTURE: x64
       ZTS_STATE: enable
+      PHP_BUILD_CRT: vc15
+      OPCACHE: yes
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    - PHP_REL: 7.2
+      ARCHITECTURE: x64
+      ZTS_STATE: disable
       PHP_BUILD_CRT: vc15
-    - PHP_REL: 7.1
+      OPCACHE: no
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    - PHP_REL: 7.2
       ARCHITECTURE: x86
       ZTS_STATE: enable
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      PHP_BUILD_CRT: vc14
-    - PHP_REL: 7.3
-      ARCHITECTURE: x86
-      ZTS_STATE: disable
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       PHP_BUILD_CRT: vc15
+      OPCACHE: no
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     - PHP_REL: 7.2
       ARCHITECTURE: x86
       ZTS_STATE: disable
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       PHP_BUILD_CRT: vc15
+      OPCACHE: yes
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
     - PHP_REL: 7.1
-      ARCHITECTURE: x86
+      ARCHITECTURE: x64
+      ZTS_STATE: enable
+      PHP_BUILD_CRT: vc14
+      OPCACHE: yes
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    - PHP_REL: 7.1
+      ARCHITECTURE: x64
       ZTS_STATE: disable
+      PHP_BUILD_CRT: vc14
+      OPCACHE: no
       APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    - PHP_REL: 7.1
+      ARCHITECTURE: x86
+      ZTS_STATE: enable
+      PHP_BUILD_CRT: vc14
+      OPCACHE: no
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+    - PHP_REL: 7.1
+      ARCHITECTURE: x86
+      ZTS_STATE: disable
       PHP_BUILD_CRT: vc14
+      OPCACHE: yes
+      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
 
 install:
   - .appveyor\install.cmd
diff --git a/.appveyor/build_task.cmd b/.appveyor/build_task.cmd
index f15503bb8..770b08858 100644
--- a/.appveyor/build_task.cmd
+++ b/.appveyor/build_task.cmd
@@ -31,7 +31,7 @@ setlocal enableextensions enabledelayedexpansion
 
 	if %errorlevel% neq 0 exit /b 3
 
-	cmd /c configure.bat --disable-all --with-mp=auto --enable-cli --%ZTS_STATE%-zts --enable-json --with-xdebug=shared --enable-object-out-dir=%PHP_BUILD_OBJ_DIR% --with-config-file-scan-dir=%APPVEYOR_BUILD_FOLDER%\build\modules.d --with-prefix=%APPVEYOR_BUILD_FOLDER%\build --with-php-build=%DEPS_DIR%
+	cmd /c configure.bat --disable-all --enable-opcache --with-mp=auto --enable-cli --%ZTS_STATE%-zts --enable-json --with-xdebug=shared --enable-object-out-dir=%PHP_BUILD_OBJ_DIR% --with-config-file-scan-dir=%APPVEYOR_BUILD_FOLDER%\build\modules.d --with-prefix=%APPVEYOR_BUILD_FOLDER%\build --with-php-build=%DEPS_DIR%
 
 	if %errorlevel% neq 0 exit /b 3
 
@@ -45,15 +45,16 @@ setlocal enableextensions enabledelayedexpansion
 	mkdir c:\tests_tmp
 	set TEST_PHP_EXECUTABLE=%APPVEYOR_BUILD_FOLDER%\build\php.exe
 	set TEST_PHP_JUNIT=c:\tests_tmp\tests-junit.xml
-	if "%OPCACHE%" equ "1" set TEST_PHP_ARGS=!TEST_PHP_ARGS! -d zend_extension=%APPVEYOR_BUILD_FOLDER%\build\ext\php_opcache.so -d opcache.enable=1 -d opcache.enable_cli=1
-	set TEST_PHP_ARGS=-n -d -foo=1 -d zend_extension=%APPVEYOR_BUILD_FOLDER%\build\ext\php_xdebug.dll -dxdebug.remote_enable=1
+	set TEST_PHP_ARGS=-n -d -foo=1 -d zend_extension=%APPVEYOR_BUILD_FOLDER%\build\ext\php_opcache.dll -d zend_extension=%APPVEYOR_BUILD_FOLDER%\build\ext\php_xdebug.dll -dxdebug.remote_enable=1
 	set SKIP_DBGP_TESTS=1
 	set SKIP_IPV6_TESTS=1
 	set REPORT_EXIT_STATUS=1
+	set OPCACHE=%OPCACHE%
+	echo !OPCACHE!
 	echo !TEST_PHP_EXECUTABLE! !TEST_PHP_ARGS! -v
-	echo !TEST_PHP_EXECUTABLE! -n run-tests.php -q -x --show-diff --show-slow 1000 --set-timeout 120 -g FAIL,XFAIL,BORK,WARN,LEAK,SKIP --temp-source c:\tests_tmp --temp-target c:\tests_tmp %APPVEYOR_BUILD_FOLDER%\tests
+	echo !TEST_PHP_EXECUTABLE! -n %APPVEYOR_BUILD_FOLDER%\run-xdebug-tests.php -q -x --show-diff %APPVEYOR_BUILD_FOLDER%\tests
 	!TEST_PHP_EXECUTABLE! !TEST_PHP_ARGS! -v
-	!TEST_PHP_EXECUTABLE! -n run-tests.php -q -x --show-diff %APPVEYOR_BUILD_FOLDER%\tests
+	!TEST_PHP_EXECUTABLE! -n %APPVEYOR_BUILD_FOLDER%\run-xdebug-tests.php -q -x --show-diff %APPVEYOR_BUILD_FOLDER%\tests
 
 	set EXIT_CODE=%errorlevel%
 	powershell -Command "$wc = New-Object 'System.Net.WebClient'; $wc.UploadFile('https://ci.appveyor.com/api/testresults/junit/%APPVEYOR_JOB_ID%', 'c:\tests_tmp\tests-junit.xml')"