diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt
deleted file mode 100644
index 0ea7021e7..000000000
--- a/cli/CMakeLists.txt
+++ /dev/null
@@ -1,52 +0,0 @@
-# Minimal CMake build file to build cppcheck command line executable
-
-SET(CHECKCLI_HDRS
-  cppcheckexecutor.h
-  threadexecutor.h
-)
-
-SET(CHECKCLI_SRCS
-  cppcheckexecutor.cpp
-  threadexecutor.cpp
-  main.cpp
-)
-
-# Add Windows resource file
-if (WIN32)
-  SET(CHECKCLI_HDRS
-    ${CHECKCLI_HDRS}
-    resource.h
-  )
-
-  SET(CHECKCLI_SRCS
-    ${CHECKCLI_SRCS}
-    cppcheck.rc
-  )
-endif (WIN32)
-
-# Libraries to link
-#set(CHECK_LIBS
-#  checklib
-#)
-
-aux_source_directory(${CPPCHECK_SOURCE_DIR}/lib LIB_SRCS)
-
-# Windows needs additional shlwapi library
-if (WIN32 AND NOT CYGWIN)
-set(CHECK_LIBS
-  ${CHECK_LIBS}
-  shlwapi
-)
-endif (WIN32 AND NOT CYGWIN)
-
-if (CMAKE_COMPILER_IS_GNUCXX)
-  set(CMAKE_CXX_FLAGS
-    ${CMAKE_CXX_FLAGS}
-    "-Wall -Wextra -pedantic"
-  )
-endif (CMAKE_COMPILER_IS_GNUCXX)
-
-include_directories (${CPPCHECK_SOURCE_DIR}/lib)
-ADD_EXECUTABLE(../cppcheck ${CHECKCLI_SRCS} ${CHECKCLI_HDRS} ${LIB_SRCS})
-TARGET_LINK_LIBRARIES(cppcheck ${CHECK_LIBS})
-
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
deleted file mode 100644
index 87a0906ab..000000000
--- a/test/CMakeLists.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-# Minimal CMake build file to build cppcheck test suite
-
-SET(CHECKTEST_HDRS
-  testsuite.h
-)
-
-SET(CHECKTEST_SRCS
-  testmemleak.cpp
-  testother.cpp
-  testpreprocessor.cpp
-  testautovariables.cpp
-  testredundantif.cpp
-  testbufferoverrun.cpp
-  testrunner.cpp
-  testcharvar.cpp
-  testsimplifytokens.cpp
-  testclass.cpp
-  teststl.cpp
-  testconstructors.cpp
-  testsuite.cpp
-  testcppcheck.cpp
-  testdangerousfunctions.cpp
-  testtoken.cpp
-  testdivision.cpp
-  testtokenize.cpp
-  testexceptionsafety.cpp
-  testunusedfunctions.cpp
-  testfilelister.cpp
-  testunusedprivfunc.cpp
-  testincompletestatement.cpp
-  testunusedvar.cpp
-  testmathlib.cpp
-)
-
-aux_source_directory(${CPPCHECK_SOURCE_DIR}/lib LIB_SRCS)
-
-# Libraries to link
-#set(CHECK_LIBS
-#  checklib
-#)
-
-# Windows needs additional shlwapi library
-if (WIN32 AND NOT CYGWIN)
-set(CHECK_LIBS
-  ${CHECK_LIBS}
-  shlwapi
-)
-endif (WIN32 AND NOT CYGWIN)
-
-if (CMAKE_COMPILER_IS_GNUCXX)
-  set(CMAKE_CXX_FLAGS
-    ${CMAKE_CXX_FLAGS}
-    "-Wall -Wextra -pedantic"
-  )
-endif (CMAKE_COMPILER_IS_GNUCXX)
-
-include_directories (${CPPCHECK_SOURCE_DIR}/lib)
-ADD_EXECUTABLE(test ${CHECKTEST_SRCS} ${CHECKTEST_HDRS} ${LIB_SRCS})
-TARGET_LINK_LIBRARIES(test ${CHECK_LIBS})
-
-# Add custom 'make check' -target
-# It compiles and runs tests
-add_custom_target(check COMMAND test)
-add_dependencies(check test)
-