diff --git a/src/main.cpp b/src/main.cpp
index f849e5dc7..67b004508 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -213,6 +213,7 @@ int main(int argc, char *argv[])
 
 	// Run unit tests
 	if (cmd_args.getFlag("run-unittests")) {
+		porting::attachOrCreateConsole();
 #if BUILD_UNITTESTS
 		if (cmd_args.exists("test-module"))
 			return run_tests(cmd_args.get("test-module")) ? 0 : 1;
@@ -228,6 +229,7 @@ int main(int argc, char *argv[])
 
 	// Run benchmarks
 	if (cmd_args.getFlag("run-benchmarks")) {
+		porting::attachOrCreateConsole();
 #if BUILD_BENCHMARKS
 		if (cmd_args.exists("test-module"))
 			return run_benchmarks(cmd_args.get("test-module").c_str()) ? 0 : 1;
@@ -635,6 +637,7 @@ static bool use_debugger(int argc, char *argv[])
 			continue;
 		new_args.push_back(argv[i]);
 	}
+	new_args.push_back("--console");
 	new_args.push_back(nullptr);
 
 #ifdef _WIN32