diff --git a/.github/actions/run-tests/action.yml b/.github/actions/run-tests/action.yml
index f7b8ab665..57464fcb1 100644
--- a/.github/actions/run-tests/action.yml
+++ b/.github/actions/run-tests/action.yml
@@ -15,7 +15,7 @@ runs:
   using: "composite"
 
   steps:
-    - name: unittests
+    - name: Unit Tests
       id: unittests
       env:
         QT_QPA_PLATFORM: offscreen
@@ -29,16 +29,16 @@ runs:
       shell: bash
       continue-on-error: true
 
-    - name: legacytests
+    - name: Legacy Tests
       id: legacytests
       env:
         QT_QPA_PLATFORM: offscreen
       run: |
-        ./${{ inputs.bin-dir }}/unittests
+        ./${{ inputs.bin-dir }}/legacytests
         result=$?
 
         if [ $result -ne 0 ]; then
-          echo "Unit tests failed with code: $result" >> $GITHUB_STEP_SUMMARY
+          echo "Legacy tests failed with code: $result" >> $GITHUB_STEP_SUMMARY
         fi
       shell: bash
       continue-on-error: true
diff --git a/.github/workflows/sonarcloud-analysis.yml b/.github/workflows/sonarcloud-analysis.yml
index a8d645a2d..4f20b74b4 100644
--- a/.github/workflows/sonarcloud-analysis.yml
+++ b/.github/workflows/sonarcloud-analysis.yml
@@ -44,22 +44,23 @@ jobs:
             -G "Ninja" \
             -DCMAKE_BUILD_TYPE="Debug" \
             -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
+            -DSKIP_BUILD_TESTS=ON \
             -DENABLE_COVERAGE=ON
 
       - name: Build
         run: |
           build-wrapper-linux-x86-64 --out-dir bw-output cmake --build build -j${CPU_CORE_COUNT}
 
-      - name: Unit tests coverage
+      - name: Legacy tests coverage
         env:
           QT_QPA_PLATFORM: offscreen
-        run: cmake --build build --target coverage-unittests
+        run: cmake --build build --target coverage-legacytests
 
       - name: Get coverage report paths
         id: coverage-paths
         run: |
-          unittests=$(find build -name coverage-unittests.xml)
-          paths="${unittests}"
+          legacytests=$(find build -name coverage-legacytests.xml)
+          paths="${legacytests}"
           if [ -z "$paths" ]; then
             echo "Error: No coverage files found"
             exit 1
diff --git a/.github/workflows/valgrind-analysis.yml b/.github/workflows/valgrind-analysis.yml
index 0a669c9b3..f8aa08f6f 100644
--- a/.github/workflows/valgrind-analysis.yml
+++ b/.github/workflows/valgrind-analysis.yml
@@ -31,10 +31,10 @@ jobs:
         run: cmake --build build -j8
 
       - name: Valgrind unit tests
-        id: unittests
+        id: legacytests
         uses: ./.github/actions/run-valgrind
         with:
-          executable: ./build/bin/unittests
+          executable: ./build/bin/legacytests
 
       - name: Set job summary
         run: |
@@ -42,9 +42,9 @@ jobs:
           message=$(cat <<EOF
           ## Valgrind summary
 
-          ### Unit tests
+          ### legacytests Unit tests
           $backticks
-          ${{ steps.unittests.outputs.summary }}
+          ${{ steps.legacytests.outputs.summary }}
           $backticks
           EOF
           )
diff --git a/cmake/Libraries.cmake b/cmake/Libraries.cmake
index 998e32894..787c38871 100644
--- a/cmake/Libraries.cmake
+++ b/cmake/Libraries.cmake
@@ -46,7 +46,7 @@ macro(configure_libs)
     message(STATUS "Enabling code coverage")
     include(cmake/CodeCoverage.cmake)
     append_coverage_compiler_flags()
-    set(test_exclude subprojects/* build/* src/test/*)
+    set(test_exclude subprojects/* build/* src/tests/*)
     set(test_src ${PROJECT_SOURCE_DIR}/src)
 
     # Apparently solves the bug in gcov where it returns negative counts and confuses gcovr.
@@ -55,15 +55,8 @@ macro(configure_libs)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-update=atomic")
 
     setup_target_for_coverage_gcovr_xml(
-      NAME coverage-integtests
-      EXECUTABLE integtests
-      BASE_DIRECTORY ${test_src}
-      EXCLUDE ${test_exclude}
-    )
-
-    setup_target_for_coverage_gcovr_xml(
-      NAME coverage-unittests
-      EXECUTABLE unittests
+      NAME coverage-legacytests
+      EXECUTABLE legacytests
       BASE_DIRECTORY ${test_src}
       EXCLUDE ${test_exclude}
     )
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index d17fee28a..9ca2a5511 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -4,7 +4,6 @@
 # SPDX-License-Identifier: MIT
 
 include(FetchContent)
-set(INSTALL_GTEST OFF)
 FetchContent_Declare(
     googletest
     GIT_REPOSITORY https://github.com/google/googletest.git
@@ -23,7 +22,7 @@ macro(config_all_tests)
 
   config_test_deps()
 
-  add_subdirectory(unittests)
+  add_subdirectory(legacytests)
 
 endmacro()
 
diff --git a/src/test/unittests/CMakeLists.txt b/src/test/legacytests/CMakeLists.txt
similarity index 91%
rename from src/test/unittests/CMakeLists.txt
rename to src/test/legacytests/CMakeLists.txt
index 332f6261b..459a73b8f 100644
--- a/src/test/unittests/CMakeLists.txt
+++ b/src/test/legacytests/CMakeLists.txt
@@ -3,6 +3,6 @@
 # SPDX-License-Identifier: MIT
 
 config_test()
-set(target unittests)
+set(target legacytests)
 add_executable(${target} ${sources} ${headers})
 target_link_libraries(${target} ${test_libs} common)
diff --git a/src/test/unittests/arch/unix/ArchNetworkBSDTests.cpp b/src/test/legacytests/arch/unix/ArchNetworkBSDTests.cpp
similarity index 100%
rename from src/test/unittests/arch/unix/ArchNetworkBSDTests.cpp
rename to src/test/legacytests/arch/unix/ArchNetworkBSDTests.cpp
diff --git a/src/test/unittests/base/LogTests.cpp b/src/test/legacytests/base/LogTests.cpp
similarity index 100%
rename from src/test/unittests/base/LogTests.cpp
rename to src/test/legacytests/base/LogTests.cpp
diff --git a/src/test/unittests/client/HelloBackTests.cpp b/src/test/legacytests/client/HelloBackTests.cpp
similarity index 100%
rename from src/test/unittests/client/HelloBackTests.cpp
rename to src/test/legacytests/client/HelloBackTests.cpp
diff --git a/src/test/unittests/deskflow/KeyStateTests.cpp b/src/test/legacytests/deskflow/KeyStateTests.cpp
similarity index 100%
rename from src/test/unittests/deskflow/KeyStateTests.cpp
rename to src/test/legacytests/deskflow/KeyStateTests.cpp
diff --git a/src/test/unittests/deskflow/ServerAppTests.cpp b/src/test/legacytests/deskflow/ServerAppTests.cpp
similarity index 100%
rename from src/test/unittests/deskflow/ServerAppTests.cpp
rename to src/test/legacytests/deskflow/ServerAppTests.cpp
diff --git a/src/test/unittests/gui/core/ClientConnectionTests.cpp b/src/test/legacytests/gui/core/ClientConnectionTests.cpp
similarity index 100%
rename from src/test/unittests/gui/core/ClientConnectionTests.cpp
rename to src/test/legacytests/gui/core/ClientConnectionTests.cpp
diff --git a/src/test/unittests/gui/core/CoreProcessTests.cpp b/src/test/legacytests/gui/core/CoreProcessTests.cpp
similarity index 100%
rename from src/test/unittests/gui/core/CoreProcessTests.cpp
rename to src/test/legacytests/gui/core/CoreProcessTests.cpp
diff --git a/src/test/unittests/gui/core/ServerConnectionTests.cpp b/src/test/legacytests/gui/core/ServerConnectionTests.cpp
similarity index 100%
rename from src/test/unittests/gui/core/ServerConnectionTests.cpp
rename to src/test/legacytests/gui/core/ServerConnectionTests.cpp
diff --git a/src/test/unittests/gui/core/WaylandWarningsTests.cpp b/src/test/legacytests/gui/core/WaylandWarningsTests.cpp
similarity index 100%
rename from src/test/unittests/gui/core/WaylandWarningsTests.cpp
rename to src/test/legacytests/gui/core/WaylandWarningsTests.cpp
diff --git a/src/test/unittests/main.cpp b/src/test/legacytests/main.cpp
similarity index 100%
rename from src/test/unittests/main.cpp
rename to src/test/legacytests/main.cpp
diff --git a/src/unittests/CMakeLists.txt b/src/unittests/CMakeLists.txt
index b8882ac3a..48ea5d777 100644
--- a/src/unittests/CMakeLists.txt
+++ b/src/unittests/CMakeLists.txt
@@ -38,6 +38,7 @@ function(create_test)
   add_test(NAME ${m_NAME} COMMAND $<TARGET_FILE:${m_NAME}> WORKING_DIRECTORY ${m_WORKING_DIRECTORY})
   set_tests_properties(${m_NAME} PROPERTIES DEPENDS ${m_DEPENDS})
   set_property(GLOBAL APPEND PROPERTY ${CMAKE_PROJECT_NAME}_tests ${m_NAME})
+
 endfunction()
 
 enable_testing()