diff --git a/src/build_settings.cpp b/src/build_settings.cpp
index 0b582eac8..55d129124 100644
--- a/src/build_settings.cpp
+++ b/src/build_settings.cpp
@@ -1308,7 +1308,9 @@ bool init_build_paths(String init_filename) {
 
 	// Do we have an extension? We might not if the output filename was supplied.
 	if (bc->build_paths[BuildPath_Output].ext.len == 0) {
-		bc->build_paths[BuildPath_Output].ext = copy_string(ha, output_extension);
+		if (build_context.metrics.os == TargetOs_windows || build_context.build_mode != BuildMode_Executable) {
+			bc->build_paths[BuildPath_Output].ext = copy_string(ha, output_extension);
+		}
 	}
 
 	// Check if output path is a directory.
diff --git a/tests/issues/run.sh b/tests/issues/run.sh
index 91ec99e05..117a9a5f1 100755
--- a/tests/issues/run.sh
+++ b/tests/issues/run.sh
@@ -8,10 +8,10 @@ COMMON="-collection:tests=tests -out:tests/issues/build/test_issue"
 set -x
 
 ./odin build tests/issues/test_issue_829.odin $COMMON -file
-tests/issues/build/test_issue.bin
+tests/issues/build/test_issue
 
 ./odin build tests/issues/test_issue_1592.odin $COMMON -file
-tests/issues/build/test_issue.bin
+tests/issues/build/test_issue
 
 set +x
 
diff --git a/tests/vendor/Makefile b/tests/vendor/Makefile
index 341067c6e..c508f6c50 100644
--- a/tests/vendor/Makefile
+++ b/tests/vendor/Makefile
@@ -10,4 +10,4 @@ endif
 all: botan_test
 
 botan_test:
-	$(ODIN) run botan -out=botan_hash -o:speed -no-bounds-check $(ODINFLAGS)
+	$(ODIN) run botan -out=test_botan_hash -o:speed -no-bounds-check $(ODINFLAGS)