diff --git a/containments/desktop/plugins/folder/CMakeLists.txt b/containments/desktop/plugins/folder/CMakeLists.txt
index 3a4fc1ee6..7fc01313e 100644
--- a/containments/desktop/plugins/folder/CMakeLists.txt
+++ b/containments/desktop/plugins/folder/CMakeLists.txt
@@ -1,46 +1,46 @@
 include(GenerateExportHeader)
 
 if(BUILD_TESTING)
    add_definitions(-DBUILD_TESTING)
 endif(BUILD_TESTING)
 
 set(folderplugin_SRCS
     directorypicker.cpp
     foldermodel.cpp
     folderplugin.cpp
     itemviewadapter.cpp
     labelgenerator.cpp
     menuhelper.cpp
     mimetypesmodel.cpp
     placesmodel.cpp
     positioner.cpp
     previewpluginsmodel.cpp
     rubberband.cpp
     subdialog.cpp
     viewpropertiesmenu.cpp
     wheelinterceptor.cpp
     shortcut.cpp
 )
 
 install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/private/desktopcontainment/folder)
 
 add_library(folderplugin SHARED ${folderplugin_SRCS})
 
 target_link_libraries(folderplugin
                       Qt5::Core
                       Qt5::Qml
                       Qt5::Quick
                       KF5::KIOCore
                       KF5::KIOWidgets
                       KF5::KIOFileWidgets
                       KF5::I18n
                       KF5::PlasmaQuick
                       KF5::ConfigGui)
 
 install(TARGETS folderplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/private/desktopcontainment/folder)
 
 generate_export_header(folderplugin BASE_NAME folderplugin)
 
 if(BUILD_TESTING)
-    add_subdirectory(tests)
+    add_subdirectory(autotests)
 endif(BUILD_TESTING)
diff --git a/containments/desktop/plugins/folder/tests/CMakeLists.txt b/containments/desktop/plugins/folder/autotests/CMakeLists.txt
similarity index 100%
rename from containments/desktop/plugins/folder/tests/CMakeLists.txt
rename to containments/desktop/plugins/folder/autotests/CMakeLists.txt
diff --git a/containments/desktop/plugins/folder/tests/foldermodeltest.cpp b/containments/desktop/plugins/folder/autotests/foldermodeltest.cpp
similarity index 100%
rename from containments/desktop/plugins/folder/tests/foldermodeltest.cpp
rename to containments/desktop/plugins/folder/autotests/foldermodeltest.cpp
diff --git a/containments/desktop/plugins/folder/tests/foldermodeltest.h b/containments/desktop/plugins/folder/autotests/foldermodeltest.h
similarity index 100%
rename from containments/desktop/plugins/folder/tests/foldermodeltest.h
rename to containments/desktop/plugins/folder/autotests/foldermodeltest.h
diff --git a/containments/desktop/plugins/folder/tests/positionertest.cpp b/containments/desktop/plugins/folder/autotests/positionertest.cpp
similarity index 100%
rename from containments/desktop/plugins/folder/tests/positionertest.cpp
rename to containments/desktop/plugins/folder/autotests/positionertest.cpp
diff --git a/containments/desktop/plugins/folder/tests/positionertest.h b/containments/desktop/plugins/folder/autotests/positionertest.h
similarity index 100%
rename from containments/desktop/plugins/folder/tests/positionertest.h
rename to containments/desktop/plugins/folder/autotests/positionertest.h
diff --git a/containments/desktop/plugins/folder/tests/viewpropertiesmenutest.cpp b/containments/desktop/plugins/folder/autotests/viewpropertiesmenutest.cpp
similarity index 100%
rename from containments/desktop/plugins/folder/tests/viewpropertiesmenutest.cpp
rename to containments/desktop/plugins/folder/autotests/viewpropertiesmenutest.cpp
diff --git a/containments/desktop/plugins/folder/tests/viewpropertiesmenutest.h b/containments/desktop/plugins/folder/autotests/viewpropertiesmenutest.h
similarity index 100%
rename from containments/desktop/plugins/folder/tests/viewpropertiesmenutest.h
rename to containments/desktop/plugins/folder/autotests/viewpropertiesmenutest.h