diff --git a/kdm/CMakeLists.txt b/kdm/CMakeLists.txt
index 44152aa8..2d177614 100644
--- a/kdm/CMakeLists.txt
+++ b/kdm/CMakeLists.txt
@@ -1,6 +1,5 @@
 include_directories( BEFORE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/backend )
 
-
 install_pam_service(KDM)
 
 include(ConfigureChecks.cmake)
@@ -13,20 +12,21 @@ set(confci ${CMAKE_CURRENT_BINARY_DIR}/config.ci)
 macro_additional_clean_files( ${confci} )
 
 add_custom_command(
-	OUTPUT ${confci}
-	COMMAND ${PERL_EXECUTABLE} -w ${confproc} ${confdef} ${confci}
-	MAIN_DEPENDENCY ${confdef}
-	DEPENDS ${confproc}
+    OUTPUT ${confci}
+    COMMAND ${PERL_EXECUTABLE} -w ${confproc} ${confdef} ${confci}
+    MAIN_DEPENDENCY ${confdef}
+    DEPENDS ${confproc}
 )
 
 add_custom_target(ConfigCi DEPENDS ${confci})
 
 ### this is *only* for the kdm home page maintainer! ###
 ADD_CUSTOM_TARGET(hp scp
-	${CMAKE_CURRENT_SOURCE_DIR}/README
-	${CMAKE_CURRENT_SOURCE_DIR}/ChangeLog
-	${CMAKE_CURRENT_SOURCE_DIR}/TODO
-	devel-home:files/kdm)
+    ${CMAKE_CURRENT_SOURCE_DIR}/README
+    ${CMAKE_CURRENT_SOURCE_DIR}/ChangeLog
+    ${CMAKE_CURRENT_SOURCE_DIR}/TODO
+    devel-home:files/kdm
+)
 
 set(backgroundlib_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/kcm/background/bgrender.cpp
diff --git a/kpasswdserver/tests/CMakeLists.txt b/kpasswdserver/tests/CMakeLists.txt
index 5874d86c..d7c9a6d9 100644
--- a/kpasswdserver/tests/CMakeLists.txt
+++ b/kpasswdserver/tests/CMakeLists.txt
@@ -1,13 +1,19 @@
-set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
-
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}/.. )
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}/..
+    ${CMAKE_CURRENT_BINARY_DIR}/..
+)
 
 set (kpasswdserver_test_SRCS
- kpasswdservertest.cpp
- ../kpasswdserver.cpp
+    kpasswdservertest.cpp
+    ../kpasswdserver.cpp
 )
+
 qt4_add_dbus_adaptor(kpasswdserver_test_SRCS ../org.kde.KPasswdServer.xml kpasswdserver.h KPasswdServer)
 
-kde4_add_unit_test(kpasswdservertest ${kpasswdserver_test_SRCS} )
-target_link_libraries(kpasswdservertest ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBRARY}
-                      ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY})
+kde4_add_test(kpasswdservertest ${kpasswdserver_test_SRCS})
+target_link_libraries(kpasswdservertest
+    ${KDE4_KDECORE_LIBS}
+    ${KDE4_KIO_LIBRARY}
+    ${QT_QTCORE_LIBRARY}
+    ${QT_QTTEST_LIBRARY}
+)