1 files changed, 10 insertions, 9 deletions
diff --git a/src/components/dbus/test/CMakeLists.txt b/src/components/dbus/test/CMakeLists.txt
index 1b3df2c0e7..d96f2388fb 100644
--- a/src/components/dbus/test/CMakeLists.txt
+++ b/src/components/dbus/test/CMakeLists.txt
@@ -28,20 +28,13 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/sources.cmake)
+if(BUILD_TESTS)
 
 include_directories (
   ${GMOCK_INCLUDE_DIRECTORY}
   ${COMPONENTS_DIR}/dbus/include/
 )
 
-#FIXME: exclude some tests
-set (EXCLUDE_PATHS
-	test_dbus_message_controller.cc
-)
-
-collect_sources(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}" ${EXCLUDE_PATHS})
-
 set (LIBRARIES
     gmock
     DBus
@@ -49,4 +42,12 @@ set (LIBRARIES
     SmartObjects
 )
 
-create_test(test_DBus_test "${SOURCES}" "${LIBRARIES}")
+set(testSources
+    ${COMPONENTS_DIR}/dbus/test/test_schema.cc
+    ${COMPONENTS_DIR}/dbus/test/test_dbus_adapter.cc
+)
+
+create_test("test_DBus_test" "${testSources}" "${LIBRARIES}")
+
+endif()
+