diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e6ac03f9..78921c4b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,6 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${qe_BINARY_DIR}/lib
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${qe_BINARY_DIR}/bin 
     CACHE 
     PATH "Single output directory for building all executables.")
-set(QE_TESTS_DIR ${qe_BINARY_DIR}/tests/bin)
 
 ###########################################################
 # Build helpers
diff --git a/FFTXlib/CMakeLists.txt b/FFTXlib/CMakeLists.txt
index 456cfa565..1f0177233 100644
--- a/FFTXlib/CMakeLists.txt
+++ b/FFTXlib/CMakeLists.txt
@@ -188,7 +188,7 @@ if(QE_ENABLE_TEST)
     set_target_properties(qe_fftx_test 
         PROPERTIES 
             OUTPUT_NAME qe_fftx_test.x 
-            RUNTIME_OUTPUT_DIRECTORY ${QE_TESTS_DIR})
+            RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
     target_link_libraries(qe_fftx_test
         PRIVATE
             qe_openmp_fortran
@@ -199,5 +199,5 @@ if(QE_ENABLE_TEST)
         target_link_libraries(qe_fftx_test PRIVATE qe_utilx)
     endif()
     add_test(NAME test_qe_fftx 
-        COMMAND ${QE_TESTS_DIR}/qe_fftx_test.x)
+        COMMAND $<TARGET_FILE:qe_fftx_test>)
 endif()
diff --git a/LAXlib/CMakeLists.txt b/LAXlib/CMakeLists.txt
index e2189fa93..731528538 100644
--- a/LAXlib/CMakeLists.txt
+++ b/LAXlib/CMakeLists.txt
@@ -89,12 +89,12 @@ if(QE_ENABLE_TEST)
     set_target_properties(qe_lax_test 
         PROPERTIES 
             OUTPUT_NAME qe_lax_test.x 
-            RUNTIME_OUTPUT_DIRECTORY ${QE_TESTS_DIR})
+            RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
     target_link_libraries(qe_lax_test
         PRIVATE
             qe_mpi_fortran
             qe_lax
             qe_lapack)
     add_test(NAME test_qe_lax 
-        COMMAND ${QE_TESTS_DIR}/qe_lax_test.x)
+        COMMAND $<TARGET_FILE:qe_lax_test>)
 endif(QE_ENABLE_TEST)
diff --git a/UtilXlib/CMakeLists.txt b/UtilXlib/CMakeLists.txt
index a40f83c11..738f1390e 100644
--- a/UtilXlib/CMakeLists.txt
+++ b/UtilXlib/CMakeLists.txt
@@ -97,7 +97,7 @@ if(QE_ENABLE_TEST)
         set_target_properties(${TGT_NAME} 
             PROPERTIES
                 OUTPUT_NAME ${TGT_NAME}.x 
-                RUNTIME_OUTPUT_DIRECTORY ${QE_TESTS_DIR})
+                RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
         target_link_libraries(${TGT_NAME}
             PRIVATE
                 qe_utilx
@@ -105,6 +105,6 @@ if(QE_ENABLE_TEST)
                 qe_mpi_fortran
                 qe_modules
                 qe_lapack)
-        add_test(NAME ${TGT_NAME} COMMAND ${QE_TESTS_DIR}/${TGT_NAME}.x)
+        add_test(NAME ${TGT_NAME} COMMAND $<TARGET_FILE:${TGT_NAME}>)
     ENDFOREACH(NAME)
 endif()
diff --git a/XClib/CMakeLists.txt b/XClib/CMakeLists.txt
index 6f11b4944..1b62c9c40 100644
--- a/XClib/CMakeLists.txt
+++ b/XClib/CMakeLists.txt
@@ -56,12 +56,12 @@ if(QE_ENABLE_TEST)
     set_target_properties(qe_xclib_test 
         PROPERTIES 
             OUTPUT_NAME qe_xclib_test.x 
-            RUNTIME_OUTPUT_DIRECTORY ${QE_TESTS_DIR})
+            RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
     target_link_libraries(qe_xclib_test
         PRIVATE
             qe_openmp_fortran
             qe_mpi_fortran
             qe_external_libxc
             qe_xclib)
-    #add_test(NAME test_qe_xclib COMMAND ${QE_TESTS_DIR}/qe_xclib_test.x)
+    #add_test(NAME test_qe_xclib COMMAND $<TARGET_FILE:qe_xclib_test>)
 endif(QE_ENABLE_TEST)
diff --git a/dft-d3/CMakeLists.txt b/dft-d3/CMakeLists.txt
index f7acec6ac..ae68907a0 100644
--- a/dft-d3/CMakeLists.txt
+++ b/dft-d3/CMakeLists.txt
@@ -21,14 +21,14 @@ if(QE_ENABLE_TEST)
     set_target_properties(qe_atomic_test_exe 
         PROPERTIES 
             OUTPUT_NAME qe_dftd3_test_atomic.x 
-            RUNTIME_OUTPUT_DIRECTORY ${QE_TESTS_DIR})
+            RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
     target_link_libraries(qe_atomic_test_exe
         PRIVATE
             qe_modules
             qe_upflib
             qe_dftd3)
     # FIXME: Does it work?
-    #add_test(NAME test_qe_dftd3_atomic COMMAND ${QE_TESTS_DIR}/qe_dftd3_test_atomic.x)
+    #add_test(NAME test_qe_dftd3_atomic COMMAND $<TARGET_FILE:qe_atomic_test_exe>)
 endif()
 
 qe_install_targets(qe_dftd3)