diff --git a/.travis.yml b/.travis.yml
index 2c34c24..728c71f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,11 +16,7 @@ arch:
         - mkdir awesome-widgets/build
         - cd awesome-widgets/build && cmake -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DCMAKE_BUILD_TYPE=Optimization -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_FUTURE=ON -DBUILD_TESTING=ON ../sources
         - cd awesome-widgets/build && make
-        - cd awesome-widgets/build && xvfb-run make test || true
-        - sleep 3
-        - cd awesome-widgets/build && xvfb-run ./test/awesomewidgets-test-awkeys || true
-        - sleep 3
-        - cd awesome-widgets/build && xvfb-run ./test/awesomewidgets-test-dpplugin || true
+        - cd awesome-widgets/build && xvfb-run make test
         - sleep 3
 
 script:
diff --git a/sources/test/awtestlibrary.cpp b/sources/test/awtestlibrary.cpp
index 57a8941..e41f0c8 100644
--- a/sources/test/awtestlibrary.cpp
+++ b/sources/test/awtestlibrary.cpp
@@ -19,13 +19,18 @@
 #include "awtestlibrary.h"
 
 #include <KWindowSystem>
+#include <QEventLoop>
 #include <QSet>
 #include <QStandardPaths>
 
 
 bool AWTestLibrary::isKWinActive()
 {
+    QEventLoop loop;
+    loop.connect(KWindowSystem::self(), SIGNAL(showingDesktopChanged(bool)), SLOT(quit()));
     KWindowSystem::setShowingDesktop(true);
+    loop.exec();
+
     bool state = KWindowSystem::showingDesktop();
     KWindowSystem::setShowingDesktop(false);