diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9d7a7ec947..e7288377ae 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -113,6 +113,18 @@ endif()
 get_property(OQS_COMPILE_OPTIONS TARGET speed_kem PROPERTY COMPILE_OPTIONS)
 add_definitions(-DOQS_COMPILE_OPTIONS="[${OQS_COMPILE_OPTIONS}]")
 
+if (CMAKE_GENERATOR MATCHES "Visual Studio")
+    # With Visual studio the output of tests go into a folder with the configuarion option. Force it to the same folder as if
+    # generating with Ninja
+    set_target_properties(
+        dump_alg_info example_kem kat_kem test_kem example_sig kat_sig test_sig test_sig_mem test_kem_mem
+        PROPERTIES 
+        RUNTIME_OUTPUT_DIRECTORY_DEBUG          "${CMAKE_BINARY_DIR}/tests"
+        RUNTIME_OUTPUT_DIRECTORY_RELEASE        "${CMAKE_BINARY_DIR}/tests"
+        RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO "${CMAKE_BINARY_DIR}/tests"
+        RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL     "${CMAKE_BINARY_DIR}/tests")
+endif()
+
 # TODO: Get CMake to find python.
 # and set PATH variable in Windows
 # for DLL builds.
diff --git a/tests/helpers.py b/tests/helpers.py
index 782b559a40..a12ebce842 100644
--- a/tests/helpers.py
+++ b/tests/helpers.py
@@ -141,9 +141,6 @@ def path_to_executable(program_name):
         if 'APPVEYOR_BUILD_FOLDER' not in os.environ: os.environ['APPVEYOR_BUILD_FOLDER'] = "."
         path = os.path.join(path, os.environ['APPVEYOR_BUILD_FOLDER'])
     path = os.path.join(path, get_current_build_dir_name(), "tests")
-    if sys.platform.startswith("win"):
-        if 'GITHUB_ACTIONS' in os.environ:
-            path = os.path.join(path, "Debug")
     for executable in [
         os.path.join(path, program_name),
         os.path.join(path, program_name + ".EXE"),