diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index bb491c1eca..ca120226b6 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -5,6 +5,7 @@ add_subdirectory(integration)
 if (HAVE_INPUT)
     add_subdirectory(libinput)
 endif()
+add_subdirectory(tabbox)
 
 ########################################################
 # Test ScreenPaintData
diff --git a/tabbox/autotests/CMakeLists.txt b/autotests/tabbox/CMakeLists.txt
similarity index 81%
rename from tabbox/autotests/CMakeLists.txt
rename to autotests/tabbox/CMakeLists.txt
index 0c04762c2d..cf7ee23207 100644
--- a/tabbox/autotests/CMakeLists.txt
+++ b/autotests/tabbox/CMakeLists.txt
@@ -4,11 +4,11 @@ add_definitions(-DKWIN_UNIT_TEST)
 # Test TabBox::ClientModel
 ########################################################
 set( testTabBoxClientModel_SRCS
-     ../clientmodel.cpp
-     ../desktopmodel.cpp
-     ../tabboxconfig.cpp
-     ../tabboxhandler.cpp
-     ../tabbox_logging.cpp
+     ../../tabbox/clientmodel.cpp
+     ../../tabbox/desktopmodel.cpp
+     ../../tabbox/tabboxconfig.cpp
+     ../../tabbox/tabboxhandler.cpp
+     ../../tabbox/tabbox_logging.cpp
      test_tabbox_clientmodel.cpp
      mock_tabboxhandler.cpp
      mock_tabboxclient.cpp
@@ -34,11 +34,11 @@ ecm_mark_as_test(testTabBoxClientModel)
 # Test TabBox::TabBoxHandler
 ########################################################
 set( testTabBoxHandler_SRCS
-     ../clientmodel.cpp
-     ../desktopmodel.cpp
-     ../tabboxconfig.cpp
-     ../tabboxhandler.cpp
-     ../tabbox_logging.cpp
+     ../../tabbox/clientmodel.cpp
+     ../../tabbox/desktopmodel.cpp
+     ../../tabbox/tabboxconfig.cpp
+     ../../tabbox/tabboxhandler.cpp
+     ../../tabbox/tabbox_logging.cpp
      test_tabbox_handler.cpp
      mock_tabboxhandler.cpp
      mock_tabboxclient.cpp
@@ -64,8 +64,8 @@ ecm_mark_as_test(testTabBoxHandler)
 # Test TabBox::TabBoxConfig
 ########################################################
 set( testTabBoxConfig_SRCS
-    ../tabboxconfig.cpp
-    ../tabbox_logging.cpp
+    ../../tabbox/tabboxconfig.cpp
+    ../../tabbox/tabbox_logging.cpp
     test_tabbox_config.cpp
 )
 
@@ -79,8 +79,8 @@ ecm_mark_as_test(testTabBoxConfig)
 # Test TabBox::DesktopChainManager
 ########################################################
 set( testDesktopChain_SRCS
-    ../desktopchain.cpp
-    ../tabbox_logging.cpp
+    ../../tabbox/desktopchain.cpp
+    ../../tabbox/tabbox_logging.cpp
     test_desktopchain.cpp
 )
 
diff --git a/tabbox/autotests/mock_tabboxclient.cpp b/autotests/tabbox/mock_tabboxclient.cpp
similarity index 100%
rename from tabbox/autotests/mock_tabboxclient.cpp
rename to autotests/tabbox/mock_tabboxclient.cpp
diff --git a/tabbox/autotests/mock_tabboxclient.h b/autotests/tabbox/mock_tabboxclient.h
similarity index 97%
rename from tabbox/autotests/mock_tabboxclient.h
rename to autotests/tabbox/mock_tabboxclient.h
index ba603dc29f..32b42d7209 100644
--- a/tabbox/autotests/mock_tabboxclient.h
+++ b/autotests/tabbox/mock_tabboxclient.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef KWIN_MOCK_TABBOX_CLIENT_H
 #define KWIN_MOCK_TABBOX_CLIENT_H
 
-#include "../tabboxhandler.h"
+#include "../../tabbox/tabboxhandler.h"
 
 #include <QIcon>
 
diff --git a/tabbox/autotests/mock_tabboxhandler.cpp b/autotests/tabbox/mock_tabboxhandler.cpp
similarity index 100%
rename from tabbox/autotests/mock_tabboxhandler.cpp
rename to autotests/tabbox/mock_tabboxhandler.cpp
diff --git a/tabbox/autotests/mock_tabboxhandler.h b/autotests/tabbox/mock_tabboxhandler.h
similarity index 98%
rename from tabbox/autotests/mock_tabboxhandler.h
rename to autotests/tabbox/mock_tabboxhandler.h
index fe03ed5828..038996b727 100644
--- a/tabbox/autotests/mock_tabboxhandler.h
+++ b/autotests/tabbox/mock_tabboxhandler.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef KWIN_MOCK_TABBOX_HANDLER_H
 #define KWIN_MOCK_TABBOX_HANDLER_H
 
-#include "../tabboxhandler.h"
+#include "../../tabbox/tabboxhandler.h"
 namespace KWin
 {
 class MockTabBoxHandler : public TabBox::TabBoxHandler
diff --git a/tabbox/autotests/test_desktopchain.cpp b/autotests/tabbox/test_desktopchain.cpp
similarity index 99%
rename from tabbox/autotests/test_desktopchain.cpp
rename to autotests/tabbox/test_desktopchain.cpp
index f7b7f39b79..a504c55dbf 100644
--- a/tabbox/autotests/test_desktopchain.cpp
+++ b/autotests/tabbox/test_desktopchain.cpp
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
 
 // KWin
-#include "../desktopchain.h"
+#include "../../tabbox/desktopchain.h"
 
 #include <QTest>
 
diff --git a/tabbox/autotests/test_tabbox_clientmodel.cpp b/autotests/tabbox/test_tabbox_clientmodel.cpp
similarity index 100%
rename from tabbox/autotests/test_tabbox_clientmodel.cpp
rename to autotests/tabbox/test_tabbox_clientmodel.cpp
diff --git a/tabbox/autotests/test_tabbox_clientmodel.h b/autotests/tabbox/test_tabbox_clientmodel.h
similarity index 100%
rename from tabbox/autotests/test_tabbox_clientmodel.h
rename to autotests/tabbox/test_tabbox_clientmodel.h
diff --git a/tabbox/autotests/test_tabbox_config.cpp b/autotests/tabbox/test_tabbox_config.cpp
similarity index 99%
rename from tabbox/autotests/test_tabbox_config.cpp
rename to autotests/tabbox/test_tabbox_config.cpp
index 16d8986e3f..60a3d353c6 100644
--- a/tabbox/autotests/test_tabbox_config.cpp
+++ b/autotests/tabbox/test_tabbox_config.cpp
@@ -17,7 +17,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 *********************************************************************/
-#include "../tabboxconfig.h"
+#include "../../tabbox/tabboxconfig.h"
 #include <QtTest/QtTest>
 using namespace KWin;
 using namespace KWin::TabBox;
diff --git a/tabbox/autotests/test_tabbox_handler.cpp b/autotests/tabbox/test_tabbox_handler.cpp
similarity index 100%
rename from tabbox/autotests/test_tabbox_handler.cpp
rename to autotests/tabbox/test_tabbox_handler.cpp
diff --git a/tabbox/CMakeLists.txt b/tabbox/CMakeLists.txt
index 1da33cfe72..030bd33fb1 100644
--- a/tabbox/CMakeLists.txt
+++ b/tabbox/CMakeLists.txt
@@ -1,5 +1,3 @@
-add_subdirectory( autotests )
-
 # Install the KWin/WindowSwitcher service type
 install( FILES kwinwindowswitcher.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 install( FILES kwindesktopswitcher.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )