diff --git a/mariadb-connector-c.spec b/mariadb-connector-c.spec
index 78a0407..0b675f3 100644
--- a/mariadb-connector-c.spec
+++ b/mariadb-connector-c.spec
@@ -3,14 +3,6 @@
 # Enable building and packing of the testsuite
 %bcond_without  testsuite
 
-# Enable CMake in-source builds
-#   This is is a workaround for the https://fedoraproject.org/wiki/Changes/CMake_to_do_out-of-source_builds
-#   which reverts the CMake behaviour to before F33
-#   The Change owners offered themselves to help fix the affected packages via ProvenPackager rights.
-#   I'm generally in favor of this change, however when I tried to adapt it, I encountered a number of issues.
-#   That's why I disabled it for now.
-%global __cmake_in_source_build 1
-
 
 
 Name:           mariadb-connector-c
@@ -176,9 +168,7 @@ install -D -p -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/my.cnf.d/client.cnf
 # - ignore the testsuite result for now. Enable tests now, fix them later.
 # Note: there must be a database called 'test' created for the testcases to be run
 %if %{with testsuite}
-pushd unittest/libmariadb/
-%ctest || :
-popd
+%ctest --test-dir %{__cmake_builddir}/unittest/libmariadb/ || :
 %endif
 
 
diff --git a/testsuite.patch b/testsuite.patch
index 6a2d2d3..957f24b 100644
--- a/testsuite.patch
+++ b/testsuite.patch
@@ -6,5 +6,5 @@
  ENDFOREACH()
 +
 +INSTALL(TARGETS ${API_TESTS} DESTINATION ${SHAREDIR}/mariadb-connector-c/tests COMPONENT Tests)
-+INSTALL(FILES ${CC_SOURCE_DIR}/unittest/mytap/libcctap.so PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${INSTALL_LIBDIR} COMPONENT Tests)
-+INSTALL(FILES ${CC_SOURCE_DIR}/unittest/libmariadb/CTestTestfile.cmake DESTINATION ${SHAREDIR}/mariadb-connector-c/tests COMPONENT Tests)
++INSTALL(FILES ${CC_BINARY_DIR}/unittest/mytap/libcctap.so PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${INSTALL_LIBDIR} COMPONENT Tests)
++INSTALL(FILES ${CC_BINARY_DIR}/unittest/libmariadb/CTestTestfile.cmake DESTINATION ${SHAREDIR}/mariadb-connector-c/tests COMPONENT Tests)