diff --git a/containments/desktop/plugins/folder/CMakeLists.txt b/containments/desktop/plugins/folder/CMakeLists.txt
--- a/containments/desktop/plugins/folder/CMakeLists.txt
+++ b/containments/desktop/plugins/folder/CMakeLists.txt
@@ -42,5 +42,5 @@
 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
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.h b/containments/desktop/plugins/folder/autotests/foldermodeltest.h
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/foldermodeltest.cpp b/containments/desktop/plugins/folder/autotests/foldermodeltest.cpp
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/positionertest.h b/containments/desktop/plugins/folder/autotests/positionertest.h
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/positionertest.cpp b/containments/desktop/plugins/folder/autotests/positionertest.cpp
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/viewpropertiesmenutest.h b/containments/desktop/plugins/folder/autotests/viewpropertiesmenutest.h
rename from containments/desktop/plugins/folder/tests/viewpropertiesmenutest.h
rename to containments/desktop/plugins/folder/autotests/viewpropertiesmenutest.h
diff --git a/containments/desktop/plugins/folder/tests/viewpropertiesmenutest.cpp b/containments/desktop/plugins/folder/autotests/viewpropertiesmenutest.cpp
rename from containments/desktop/plugins/folder/tests/viewpropertiesmenutest.cpp
rename to containments/desktop/plugins/folder/autotests/viewpropertiesmenutest.cpp