diff --git a/CMakeLists.txt b/CMakeLists.txt
index 39c9f07df..bbe176b58 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -195,5 +195,6 @@ include(KConfigMacros)
 
 add_subdirectory( desktoptheme )
 add_subdirectory( plasma )
+add_subdirectory( shell )
 
 feature_summary(WHAT ALL   FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/plasma/tests/CMakeLists.txt b/plasma/tests/CMakeLists.txt
index 19e04892d..8d66e4674 100644
--- a/plasma/tests/CMakeLists.txt
+++ b/plasma/tests/CMakeLists.txt
@@ -33,5 +33,3 @@ if(QCA2_FOUND)
   target_link_libraries(plasmoidpackagetest ${QCA2_LIBRARIES})
 endif(QCA2_FOUND)
 
-add_subdirectory(shelltest)
-
diff --git a/plasma/tests/shelltest/CMakeLists.txt b/shell/CMakeLists.txt
similarity index 95%
rename from plasma/tests/shelltest/CMakeLists.txt
rename to shell/CMakeLists.txt
index 6b2569017..0dd5846b4 100644
--- a/plasma/tests/shelltest/CMakeLists.txt
+++ b/shell/CMakeLists.txt
@@ -48,3 +48,5 @@ target_link_libraries(testplasma2
  ${KDE4_PLASMA_LIBS}
  #plasma
 )
+
+install(TARGETS testplasma2 ${INSTALL_TARGETS_DEFAULT_ARGS})
\ No newline at end of file
diff --git a/plasma/tests/shelltest/desktopcorona.cpp b/shell/desktopcorona.cpp
similarity index 100%
rename from plasma/tests/shelltest/desktopcorona.cpp
rename to shell/desktopcorona.cpp
diff --git a/plasma/tests/shelltest/desktopcorona.h b/shell/desktopcorona.h
similarity index 100%
rename from plasma/tests/shelltest/desktopcorona.h
rename to shell/desktopcorona.h
diff --git a/plasma/tests/shelltest/main.cpp b/shell/main.cpp
similarity index 100%
rename from plasma/tests/shelltest/main.cpp
rename to shell/main.cpp
diff --git a/plasma/tests/shelltest/main.qml b/shell/main.qml
similarity index 100%
rename from plasma/tests/shelltest/main.qml
rename to shell/main.qml
diff --git a/plasma/tests/shelltest/svg.cpp b/shell/svg.cpp
similarity index 100%
rename from plasma/tests/shelltest/svg.cpp
rename to shell/svg.cpp
diff --git a/plasma/tests/shelltest/svg.h b/shell/svg.h
similarity index 100%
rename from plasma/tests/shelltest/svg.h
rename to shell/svg.h
diff --git a/plasma/tests/shelltest/view.cpp b/shell/view.cpp
similarity index 100%
rename from plasma/tests/shelltest/view.cpp
rename to shell/view.cpp
diff --git a/plasma/tests/shelltest/view.h b/shell/view.h
similarity index 100%
rename from plasma/tests/shelltest/view.h
rename to shell/view.h