diff --git a/.travis.yml b/.travis.yml
index 07653040dd9a7..87a86956738e1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,8 +15,12 @@ env:
       - PDO_MYSQL_TEST_USER=travis
       - PDO_MYSQL_TEST_PASS=
       - PDO_MYSQL_TEST_HOST=127.0.0.1
-    matrix:
       - REPORT_EXIT_STATUS=1
+    matrix:
+      - ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=0
+      - ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=0
+      - ENABLE_MAINTAINER_ZTS=0 ENABLE_DEBUG=1
+      - ENABLE_MAINTAINER_ZTS=1 ENABLE_DEBUG=1
 
 before_script:
     # Compile PHP
diff --git a/ext/mbstring/tests/zend_multibyte-08.phpt b/ext/mbstring/tests/zend_multibyte-08.phpt
index 488e2a00caf86..a0989fc562a38 100644
--- a/ext/mbstring/tests/zend_multibyte-08.phpt
+++ b/ext/mbstring/tests/zend_multibyte-08.phpt
@@ -1,6 +1,8 @@
 --TEST--
 zend multibyte (8)
 --SKIPIF--
+--XFAIL--
+https://bugs.php.net/bug.php?id=66582
 --INI--
 zend.multibyte=On
 zend.script_encoding=ISO-8859-1
diff --git a/travis/compile.sh b/travis/compile.sh
index eee3f9ad8931b..8b54b714ad3f9 100755
--- a/travis/compile.sh
+++ b/travis/compile.sh
@@ -1,6 +1,18 @@
 #!/bin/bash
+if [[ "$ENABLE_MAINTAINER_ZTS" == 1 ]]; then
+	TS="--enable-maintainer-zts";
+else
+	TS="";
+fi
+if [[ "$ENABLE_DEBUG" == 1 ]]; then
+	DEBUG="--enable-debug";
+else
+	DEBUG="";
+fi
 ./buildconf
 ./configure --quiet \
+$DEBUG \
+$TS \
 --with-pdo-mysql=mysqlnd \
 --with-mysql=mysqlnd \
 --with-mysqli=mysqlnd \