diff --git a/.circleci/config.yml b/.circleci/config.yml
index dcd8f58..90dfed7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -33,12 +33,6 @@ commands:
       - run:
           name: build
           command: ninja -vC build
-  test-xvfb:
-    steps:
-      - run:
-          name: xxx
-          command: xvfb-run -s "-screen 0 640x480x24" glxinfo
-
 
 jobs:
   basic:
@@ -61,6 +55,9 @@ jobs:
       - run:
           name: test config file parsing
           command: xvfb-run -s "-screen 0 640x480x24" build/src/compton --config compton.sample.conf --vsync=none --diagnostics
+      - run:
+          name: run testsuite
+          command: tests/run_tests.sh build/src/compton
       - run:
           name: generate coverage reports
           command: cd build; find -name '*.gcno' -exec gcov -pb {} +
@@ -122,6 +119,4 @@ workflows:
       - test:
           requires:
             - basic
-#     - test-xvfb
-
 # vim: set sw=2 ts=8 et:
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
new file mode 100755
index 0000000..6d59675
--- /dev/null
+++ b/tests/run_tests.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+compton=$(realpath $1)
+cd $(dirname $0)
+
+./run_one_test.sh $compton ./basic.py