diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80c5fd8..2a65f0a 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -124,15 +124,6 @@ if(BUILD_CODE_GEN)
     add_subdirectory("${CMAKE_SOURCE_DIR}/stub-generator")
 endif()
 
-#----------------------------------
-# PERFORMANCE TESTS
-#----------------------------------
-
-option(ENABLE_PERFTESTS "Build and install performance tests (default OFF)" OFF)
-
-if(ENABLE_PERFTESTS)
-    add_subdirectory("${CMAKE_SOURCE_DIR}/perftest")
-endif()
 
 #----------------------------------
 # DOCUMENTATION
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 1905f2d..a8b8aed 100755
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -69,6 +69,15 @@ target_link_libraries(libsdbus-c++_unittests ${SYSTEMD_LIBRARIES} gmock gmock_ma
 add_executable(libsdbus-c++_integrationtests ${INTEGRATIONTESTS_SRCS})
 target_link_libraries(libsdbus-c++_integrationtests sdbus-c++ gmock gmock_main)
 
+# Manual performance tests
+option(ENABLE_PERFTESTS "Build and install manual performance tests (default OFF)" OFF)
+if(ENABLE_PERFTESTS)
+    add_executable(libsdbus-c++_perftests_client perftests/client.cpp perftests/perftest-proxy.h)
+    target_link_libraries(libsdbus-c++_perftests_client sdbus-c++)
+    add_executable(libsdbus-c++_perftests_server perftests/server.cpp perftests/perftest-adaptor.h)
+    target_link_libraries(libsdbus-c++_perftests_server sdbus-c++)
+endif()
+
 #----------------------------------
 # INSTALLATION
 #----------------------------------
@@ -77,6 +86,12 @@ install(TARGETS libsdbus-c++_unittests DESTINATION /opt/test/bin)
 install(TARGETS libsdbus-c++_integrationtests DESTINATION /opt/test/bin)
 install(FILES ${INTEGRATIONTESTS_SOURCE_DIR}/files/libsdbus-cpp-test.conf DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d)
 
+if(ENABLE_PERFTESTS)
+    install(TARGETS libsdbus-c++_perftests_client DESTINATION /opt/test/bin)
+    install(TARGETS libsdbus-c++_perftests_server DESTINATION /opt/test/bin)
+    install(FILES perftests/files/org.sdbuscpp.perftest.conf DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d)
+endif()
+
 #----------------------------------
 # RUNNING THE TESTS UPON BUILD
 #----------------------------------
diff --git a/perftest/CMakeLists.txt b/test/perftests/CMakeLists.txt
similarity index 100%
rename from perftest/CMakeLists.txt
rename to test/perftests/CMakeLists.txt
diff --git a/perftest/client.cpp b/test/perftests/client.cpp
similarity index 84%
rename from perftest/client.cpp
rename to test/perftests/client.cpp
index 8ef4414..61b6a02 100644
--- a/perftest/client.cpp
+++ b/test/perftests/client.cpp
@@ -1,3 +1,28 @@
+/**
+ * (C) 2019 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
+ *
+ * @file client.cpp
+ *
+ * Created on: Jan 25, 2019
+ * Project: sdbus-c++
+ * Description: High-level D-Bus IPC C++ library based on sd-bus
+ *
+ * This file is part of sdbus-c++.
+ *
+ * sdbus-c++ is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * sdbus-c++ is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with sdbus-c++. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "perftest-proxy.h"
 #include <sdbus-c++/sdbus-c++.h>
 #include <vector>
diff --git a/perftest/org.sdbuscpp.perftest.conf b/test/perftests/files/org.sdbuscpp.perftest.conf
similarity index 100%
rename from perftest/org.sdbuscpp.perftest.conf
rename to test/perftests/files/org.sdbuscpp.perftest.conf
diff --git a/perftest/org.sdbuscpp.perftest.xml b/test/perftests/org.sdbuscpp.perftest.xml
similarity index 100%
rename from perftest/org.sdbuscpp.perftest.xml
rename to test/perftests/org.sdbuscpp.perftest.xml
diff --git a/perftest/perftest-adaptor.h b/test/perftests/perftest-adaptor.h
similarity index 100%
rename from perftest/perftest-adaptor.h
rename to test/perftests/perftest-adaptor.h
diff --git a/perftest/perftest-proxy.h b/test/perftests/perftest-proxy.h
similarity index 100%
rename from perftest/perftest-proxy.h
rename to test/perftests/perftest-proxy.h
diff --git a/perftest/server.cpp b/test/perftests/server.cpp
similarity index 70%
rename from perftest/server.cpp
rename to test/perftests/server.cpp
index aaa1594..490331f 100644
--- a/perftest/server.cpp
+++ b/test/perftests/server.cpp
@@ -1,3 +1,28 @@
+/**
+ * (C) 2019 KISTLER INSTRUMENTE AG, Winterthur, Switzerland
+ *
+ * @file server.cpp
+ *
+ * Created on: Jan 25, 2019
+ * Project: sdbus-c++
+ * Description: High-level D-Bus IPC C++ library based on sd-bus
+ *
+ * This file is part of sdbus-c++.
+ *
+ * sdbus-c++ is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * sdbus-c++ is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with sdbus-c++. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "perftest-adaptor.h"
 #include <sdbus-c++/sdbus-c++.h>
 #include <vector>