diff --git a/ci/matrix.sh b/ci/matrix.sh
index 91ce9658c..e033ee3d5 100755
--- a/ci/matrix.sh
+++ b/ci/matrix.sh
@@ -66,9 +66,10 @@ elif [ "$BUILD_TARGET" = "linux64" ]; then
   export RUN_TESTS=true
 elif [ "$BUILD_TARGET" = "linux64_nowallet" ]; then
   export HOST=x86_64-unknown-linux-gnu
-  export PACKAGES="python3 xvfb"
+  export PACKAGES="python3"
   export DEP_OPTS="NO_WALLET=1"
   export BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
+  export RUN_TESTS=true
 elif [ "$BUILD_TARGET" = "linux64_release" ]; then
   export HOST=x86_64-unknown-linux-gnu
   export PACKAGES="bc python3-zmq"
diff --git a/ci/test_unittests.sh b/ci/test_unittests.sh
index 9c88ee0fc..2d221c66b 100755
--- a/ci/test_unittests.sh
+++ b/ci/test_unittests.sh
@@ -20,12 +20,6 @@ export BOOST_TEST_LOG_LEVEL=test_suite
 
 cd build-ci/dashcore-$BUILD_TARGET
 
-if [ "$RUN_TESTS" = "true" -a "${DEP_OPTS#*NO_QT=1}" = "$DEP_OPTS" ]; then
-  export DISPLAY=:99.0;
-  # Start xvfb if needed, as documented at https://docs.travis-ci.com/user/gui-and-headless-browsers/#Using-xvfb-to-Run-Tests-That-Require-a-GUI
-  /sbin/start-stop-daemon --start --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac;
-fi
-
 if [ "$DIRECT_WINE_EXEC_TESTS" = "true" ]; then
   # Inside Docker, binfmt isn't working so we can't trust in make invoking windows binaries correctly
   wine ./src/test/test_dash.exe