diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7aeb3c125..13f4beac7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -108,7 +108,7 @@ include(cmake/Packaging.cmake)
 
 include(GNUInstallDirs)
 
-configure_definitions()
+configure_options()
 configure_libs()
 
 add_subdirectory(doc)
diff --git a/cmake/Definitions.cmake b/cmake/Definitions.cmake
index 7522ea86b..3d25533d8 100644
--- a/cmake/Definitions.cmake
+++ b/cmake/Definitions.cmake
@@ -14,15 +14,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-macro(configure_definitions)
-
-  configure_options()
-
-  set(INTEG_TESTS_BIN integtests)
-  set(UNIT_TESTS_BIN unittests)
-
-endmacro()
-
 macro(configure_options)
 
   set(DEFAULT_BUILD_GUI ON)
diff --git a/cmake/Libraries.cmake b/cmake/Libraries.cmake
index 40aa0f328..d3e49ea9e 100644
--- a/cmake/Libraries.cmake
+++ b/cmake/Libraries.cmake
@@ -387,9 +387,9 @@ macro(configure_coverage)
 
     setup_target_for_coverage_gcovr_xml(
       NAME
-      coverage-${INTEG_TESTS_BIN}
+      coverage-integtests
       EXECUTABLE
-      ${INTEG_TESTS_BIN}
+      integtests
       BASE_DIRECTORY
       ${test_src}
       EXCLUDE
@@ -397,9 +397,9 @@ macro(configure_coverage)
 
     setup_target_for_coverage_gcovr_xml(
       NAME
-      coverage-${UNIT_TESTS_BIN}
+      coverage-unittests
       EXECUTABLE
-      ${UNIT_TESTS_BIN}
+      unittests
       BASE_DIRECTORY
       ${test_src}
       EXCLUDE
diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt
index 8e3ca7cce..f9ef289c3 100644
--- a/src/test/integtests/CMakeLists.txt
+++ b/src/test/integtests/CMakeLists.txt
@@ -15,6 +15,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 config_test()
-set(target ${INTEG_TESTS_BIN})
+set(target integtests)
 add_executable(${target} ${sources} ${headers})
 target_link_libraries(${target} ${test_libs})
diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt
index 8dce63700..b7ddaa4d7 100644
--- a/src/test/unittests/CMakeLists.txt
+++ b/src/test/unittests/CMakeLists.txt
@@ -15,6 +15,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 config_test()
-set(target ${UNIT_TESTS_BIN})
+set(target unittests)
 add_executable(${target} ${sources} ${headers})
 target_link_libraries(${target} ${test_libs})