diff --git a/cmd/tools/modules/testing/common.v b/cmd/tools/modules/testing/common.v
index 6e6f1fe747..3cc49502f2 100644
--- a/cmd/tools/modules/testing/common.v
+++ b/cmd/tools/modules/testing/common.v
@@ -226,7 +226,6 @@ pub fn new_test_session(_vargs string, will_compile bool) TestSession {
 		skip_files << 'examples/coroutines/coroutines_bench.v'
 		$if msvc {
 			skip_files << 'vlib/v/tests/consts/const_comptime_eval_before_vinit_test.v' // _constructor used
-			skip_files << 'vlib/v/tests/project_with_cpp_code/compiling_cpp_files_with_a_cplusplus_compiler_test.c.v'
 		}
 		$if solaris {
 			skip_files << 'examples/pico/pico.v'
diff --git a/vlib/v/builder/msvc_windows.v b/vlib/v/builder/msvc_windows.v
index 7bf0c36aa6..8b1dda0570 100644
--- a/vlib/v/builder/msvc_windows.v
+++ b/vlib/v/builder/msvc_windows.v
@@ -401,7 +401,11 @@ fn (mut v Builder) build_thirdparty_obj_file_with_msvc(mod string, path string,
 	}
 	println('${obj_path} not found, building it (with msvc)...')
 	flush_stdout()
-	cfile := '${path_without_o_postfix}.c'
+	cfile := if os.exists('${path_without_o_postfix}.c') {
+		'${path_without_o_postfix}.c'
+	} else {
+		'${path_without_o_postfix}.cpp'
+	}
 	flags := msvc_string_flags(moduleflags)
 	inc_dirs := flags.inc_paths.join(' ')
 	defines := flags.defines.join(' ')