diff --git a/.travis.yml b/.travis.yml
index 33d030bc7..961fbfe4a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,18 +6,8 @@ os: linux
 
 env:
   global:
-    - MARIADB_URL=https://downloads.mariadb.org/interstitial/mariadb-5.5.48/bintar-linux-glibc_214-x86_64/mariadb-5.5.48-linux-glibc_214-x86_64.tar.gz/from/http%3A//mirror.netinch.com/pub/mariadb/
-    - MARIADB_TAR=mariadb-5.5.48-linux-glibc_214-x86_64.tar.gz
-    - MARIADB_DIR=mariadb-5.5.48-linux-x86_64
     - secure: "kfzqiIq1XhZ89XYsnqFhPKr5UWB+W4fYAYpOYOLgWMmqfjwqQTm1nN/A6TuFmdbTrzB6hLawsxIUrPS+QKs4TI8tTQMRZ8IZV4TIUQVa7SNQljwrKvnSu0fSoqpPrvXxjEjbTlvpo7X5EKCyCB0Xz6NaYVJIvE9bYnwCEAJw30k="
 
-
-# prepare the environment
-before_script:
-  # get mariadb packages from mariadb.org
-  - chmod +x .travis/download_mariadb.sh
-  - .travis/download_mariadb.sh
-
 # actual compilation commands
 script:
   - chmod +x .travis/build_maxscale.sh
diff --git a/.travis/build_maxscale.sh b/.travis/build_maxscale.sh
index 919455cb5..dd1b89658 100644
--- a/.travis/build_maxscale.sh
+++ b/.travis/build_maxscale.sh
@@ -8,16 +8,15 @@
 
 
 echo TRAVIS_BUILD_DIR: ${TRAVIS_BUILD_DIR}
-echo MARIADB_DIR: ${MARIADB_DIR}
 
 mkdir build
 cd build
 
-cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DMYSQL_EMBEDDED_INCLUDE_DIR=${TRAVIS_BUILD_DIR}/${MARIADB_DIR}/include/ -DMYSQL_EMBEDDED_LIBRARIES=${TRAVIS_BUILD_DIR}/${MARIADB_DIR}/lib/libmysqld.a -DERRMSG=${TRAVIS_BUILD_DIR}/${MARIADB_DIR}/share/english/errmsg.sys
+cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_TESTS=Y
 
 make VERBOSE=1
+make test
 sudo make install
-sudo make testcore
 
 sudo ./postinst
 maxscale --version
diff --git a/.travis/download_mariadb.sh b/.travis/download_mariadb.sh
deleted file mode 100755
index 2e9502adc..000000000
--- a/.travis/download_mariadb.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#/bin/sh -f
-
-# these environment variables are set in .travis.yml
-# MARIADB_URL=https://downloads.mariadb.org/interstitial/mariadb-5.5.48/bintar-linux-glibc_214-x86_64/mariadb-5.5.48-linux-glibc_214-x86_64.tar.gz/from/http%3A//mirror.netinch.com/pub/mariadb/
-# MARIADB_TAR=mariadb-5.5.48-linux-glibc_214-x86_64.tar.gz
-# MARIADB_DIR=mariadb-5.5.48-linux-x86_64
-
-# get mariadb
-wget --content-disposition ${MARIADB_URL}
-
-# unompress
-tar -axf ${MARIADB_TAR}
diff --git a/server/core/test/testqueuemanager.c b/server/core/test/testqueuemanager.c
index 7ae21dfb1..cd250f816 100644
--- a/server/core/test/testqueuemanager.c
+++ b/server/core/test/testqueuemanager.c
@@ -25,6 +25,10 @@
 // To ensure that ss_info_assert asserts also when builing in non-debug mode.
 #if !defined(SS_DEBUG)
 #define SS_DEBUG
+int debug_check_fail = 1;
+#else
+// This is defined in the queuemanager code but only in debug builds
+extern int debug_check_fail;
 #endif
 #if defined(NDEBUG)
 #undef NDEBUG
@@ -44,8 +48,6 @@
  *
  */
 
-extern int debug_check_fail;
-
 #define TEST_QUEUE_SIZE 5
 #define HEARTBEATS_TO_EXPIRE 3
 #define NUMBER_OF_THREADS 4