diff --git a/clients/CMakeLists.txt b/clients/CMakeLists.txt
index 9f97b7376..d1debf206 100644
--- a/clients/CMakeLists.txt
+++ b/clients/CMakeLists.txt
@@ -22,3 +22,13 @@
 
 add_subdirectory(python)
 add_subdirectory(opal)
+
+add_executable(villas-shmem shmem/villas-shmem.cpp)
+
+target_link_libraries(villas-shmem PUBLIC villas)
+
+install(
+    TARGETS villas-shmem
+    COMPONENT bin
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
diff --git a/src/villas-test-shmem.cpp b/clients/shmem/villas-shmem.cpp
similarity index 100%
rename from src/villas-test-shmem.cpp
rename to clients/shmem/villas-shmem.cpp
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a6d49d441..9b2bbf344 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -25,10 +25,9 @@ link_libraries(villas)
 
 add_executable(villas-node villas-node.cpp)
 add_executable(villas-test-rtt villas-test-rtt.cpp)
-add_executable(villas-test-shmem villas-test-shmem.cpp)
 
 install(
-    TARGETS villas-node villas-test-rtt villas-test-shmem
+    TARGETS villas-node villas-test-rtt
     COMPONENT bin
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )