diff --git a/bin/wsim b/bin/wsim
index c7c0bc508..7dca19edd 100755
--- a/bin/wsim
+++ b/bin/wsim
@@ -50,7 +50,7 @@ def validateArgs(args):
     elif (args.tb == "testbench_fp" and args.sim != "questa"):
         print("Error: testbench_fp presently only supported by Questa, not VCS or Verilator, because of a touchy testbench")
         sys.exit(1)
-    elif ("breker" in args.elf or "breker" in args.testsuite) and args.sim != "questa":
+    elif (args.config == "breker" and args.sim != "questa"):
         print("Error: Breker tests currently only supported by Questa")
         sys.exit(1)
 
diff --git a/testbench/trek_files/Makefile b/testbench/trek_files/Makefile
index 08c916ced..62a045af2 100644
--- a/testbench/trek_files/Makefile
+++ b/testbench/trek_files/Makefile
@@ -1,4 +1,4 @@
-SHELL 					 := /bin/bash
+SHELL            := /bin/bash
 TREKFILES        := $(WALLY)/testbench/trek_files
 PLATFORM_YAML    := $(TREKFILES)/platform.yaml
 TREKSVIP_YAML    := $(BREKER_HOME)/examples/tutorials/svip/treksvip/yaml/treksvip.yaml
diff --git a/tests/breker/Makefile b/tests/breker/Makefile
index bdb26bf87..fc56d8805 100644
--- a/tests/breker/Makefile
+++ b/tests/breker/Makefile
@@ -18,7 +18,7 @@ MARCH         :=-march=rv64gc_zcb_zfa_zba_zbb_zbc_zbs_zfh_zicboz_zicbop_zicbom_z
 MABI          :=-mabi=lp64d
 LINKER        := $(START_LIB_DIR)/test.ld
 LINK_FLAGS    := -nostartfiles
-CFLAGS 		    := -Wa,-alhs -Wa,-L -mcmodel=medany -Og -DSINGLE_CPU 
+CFLAGS        := -Wa,-alhs -Wa,-L -mcmodel=medany -Og -DSINGLE_CPU
 WIDTH         := 64
 
 # Find all constraint files and generate tests for each one