diff --git a/test/asm/misleading-indentation.asm b/test/asm/misleading-indentation.asm
new file mode 100644
index 00000000..84fd8c74
--- /dev/null
+++ b/test/asm/misleading-indentation.asm
@@ -0,0 +1,4 @@
+IF 1
+    REPT 1
+ENDC ; misleading indentation!
+    ENDR
diff --git a/test/asm/misleading-indentation.err b/test/asm/misleading-indentation.err
new file mode 100644
index 00000000..ff5e7193
--- /dev/null
+++ b/test/asm/misleading-indentation.err
@@ -0,0 +1,2 @@
+FATAL: Found `ENDC` outside of a conditional (not after an `IF`/`ELIF`/`ELSE` block)
+    at misleading-indentation.asm::REPT~1(3) <- misleading-indentation.asm(2)
diff --git a/test/asm/test.sh b/test/asm/test.sh
index edbaafac..6d51a36a 100755
--- a/test/asm/test.sh
+++ b/test/asm/test.sh
@@ -62,7 +62,7 @@ fi
 
 for i in *.asm notexist.asm; do
 	flags=${i%.asm}.flags
-	RGBASMFLAGS="-Weverything -B collapse"
+	RGBASMFLAGS="-Weverything -Bcollapse"
 	if [ -f "$flags" ]; then
 		RGBASMFLAGS="$RGBASMFLAGS $(head -n 1 "$flags")" # Allow other lines to serve as comments
 	fi
@@ -163,7 +163,7 @@ done
 # These tests do their own thing
 
 i="continues-after-missing-include"
-RGBASMFLAGS="-Weverything -B collapse -M - -MG -MC"
+RGBASMFLAGS="-Weverything -Bcollapse -M - -MG -MC"
 # Piping the .asm file to rgbasm would not make sense for dependency generation,
 # so just test the normal variant
 (( tests++ ))
@@ -193,9 +193,9 @@ i="state-file"
 if which cygpath &>/dev/null; then
 	# MinGW translates path names before passing them as command-line arguments,
 	# but does not do so when they are prefixed, so we have to do it ourselves.
-	RGBASMFLAGS="-Weverything -B collapse -s all:$(cygpath -w "$o")"
+	RGBASMFLAGS="-Weverything -Bcollapse -s all:$(cygpath -w "$o")"
 else
-	RGBASMFLAGS="-Weverything -B collapse -s all:$o"
+	RGBASMFLAGS="-Weverything -Bcollapse -s all:$o"
 fi
 for variant in '' '.pipe'; do
 	(( tests++ ))
diff --git a/test/link/test.sh b/test/link/test.sh
index 782176a2..e9247f16 100755
--- a/test/link/test.sh
+++ b/test/link/test.sh
@@ -73,7 +73,7 @@ tryCmpRomSize () {
 }
 
 rgblinkQuiet () {
-	out="$(env "$RGBLINK" -Weverything -B collapse "$@")" || return $?
+	out="$(env "$RGBLINK" -Weverything -Bcollapse "$@")" || return $?
 	if [[ -n "$out" ]]; then
 		echo "$bold${red}Linking shouldn't produce anything on stdout!${rescolors}${resbold}"
 		false
@@ -266,8 +266,8 @@ evaluateTest
 test="pipeline"
 startTest
 continueTest
-("$RGBASM" -Weverything -B collapse -o - - | \
- "$RGBLINK" -Weverything -B collapse -o - - | \
+("$RGBASM" -Weverything -Bcollapse -o - - | \
+ "$RGBLINK" -Weverything -Bcollapse -o - - | \
  "$RGBFIX" -Weverything -v -p 0xff -) < "$test"/a.asm > "$gbtemp"
 # This test does not trim its output with 'dd' because it needs to verify the correct output size
 tryCmp "$test"/out.gb "$gbtemp"