diff --git a/testmaps/qbsp_brush_clipping_order.map b/testmaps/qbsp_brush_clipping_order.map
index 362a03d1..69f9cc0d 100644
--- a/testmaps/qbsp_brush_clipping_order.map
+++ b/testmaps/qbsp_brush_clipping_order.map
@@ -1,14 +1,10 @@
 // Game: Quake
 // Format: Standard
-
-// The sbutt2 brush should "win" in clipping against the floor,
-// in both a worldspawn test case, as well as a func_wall.
-
 // entity 0
 {
 "mapversion" "220"
 "classname" "worldspawn"
-"wad" "deprecated/free_wad.wad"
+"wad" "deprecated/free_wad.wad;deprecated/hintskip.wad"
 // brush 0
 {
 ( -128 -64 -16 ) ( -128 -63 -16 ) ( -128 -64 -15 ) brown_brick 0 0 0 1 1
@@ -27,6 +23,60 @@
 ( 24 16 16 ) ( 25 16 16 ) ( 24 16 17 ) sbutt2 0 0 0 1 1
 ( 16 40 16 ) ( 16 40 17 ) ( 16 41 16 ) sbutt2 0 0 0 1 1
 }
+// brush 2
+{
+( 376 152 168 ) ( 376 -136 168 ) ( 376 152 -224 ) skip 0 0 0 1 1
+( 384 -136 -224 ) ( 376 -136 -224 ) ( 384 -136 168 ) skip 0 0 0 1 1
+( 384 152 -224 ) ( 376 152 -224 ) ( 384 -136 -224 ) skip 0 0 0 1 1
+( 384 -136 168 ) ( 376 -136 168 ) ( 384 152 168 ) skip 0 0 0 1 1
+( 384 152 168 ) ( 376 152 168 ) ( 384 152 -224 ) skip 0 0 0 1 1
+( 384 -136 168 ) ( 384 152 168 ) ( 384 -136 -224 ) skip 0 0 0 1 1
+}
+// brush 3
+{
+( -256 -136 -224 ) ( -256 152 -224 ) ( -256 -136 168 ) skip 0 0 0 1 1
+( -256 -136 168 ) ( -248 -136 168 ) ( -256 -136 -224 ) skip 0 0 0 1 1
+( -256 -136 -224 ) ( -248 -136 -224 ) ( -256 152 -224 ) skip 0 0 0 1 1
+( -256 152 168 ) ( -248 152 168 ) ( -256 -136 168 ) skip 0 0 0 1 1
+( -256 152 -224 ) ( -248 152 -224 ) ( -256 152 168 ) skip 0 0 0 1 1
+( -248 -136 -224 ) ( -248 -136 168 ) ( -248 152 -224 ) skip 0 0 0 1 1
+}
+// brush 4
+{
+( -248 152 168 ) ( -248 144 168 ) ( -248 152 -224 ) skip 0 0 0 1 1
+( 376 144 168 ) ( 376 144 -224 ) ( -248 144 168 ) skip 0 0 0 1 1
+( -248 152 -224 ) ( -248 144 -224 ) ( 376 152 -224 ) skip 0 0 0 1 1
+( 376 152 168 ) ( 376 144 168 ) ( -248 152 168 ) skip 0 0 0 1 1
+( 376 152 168 ) ( -248 152 168 ) ( 376 152 -224 ) skip 0 0 0 1 1
+( 376 152 -224 ) ( 376 144 -224 ) ( 376 152 168 ) skip 0 0 0 1 1
+}
+// brush 5
+{
+( -248 -136 -224 ) ( -248 -128 -224 ) ( -248 -136 168 ) skip 0 0 0 1 1
+( 376 -136 -224 ) ( -248 -136 -224 ) ( 376 -136 168 ) skip 0 0 0 1 1
+( 376 -136 -224 ) ( 376 -128 -224 ) ( -248 -136 -224 ) skip 0 0 0 1 1
+( -248 -136 168 ) ( -248 -128 168 ) ( 376 -136 168 ) skip 0 0 0 1 1
+( -248 -128 -224 ) ( 376 -128 -224 ) ( -248 -128 168 ) skip 0 0 0 1 1
+( 376 -136 168 ) ( 376 -128 168 ) ( 376 -136 -224 ) skip 0 0 0 1 1
+}
+// brush 6
+{
+( -248 -128 168 ) ( -248 -128 160 ) ( -248 144 168 ) skip 0 0 0 1 1
+( 376 -128 168 ) ( 376 -128 160 ) ( -248 -128 168 ) skip 0 0 0 1 1
+( 376 144 160 ) ( -248 144 160 ) ( 376 -128 160 ) skip 0 0 0 1 1
+( 376 144 168 ) ( 376 -128 168 ) ( -248 144 168 ) skip 0 0 0 1 1
+( -248 144 168 ) ( -248 144 160 ) ( 376 144 168 ) skip 0 0 0 1 1
+( 376 144 168 ) ( 376 144 160 ) ( 376 -128 168 ) skip 0 0 0 1 1
+}
+// brush 7
+{
+( -248 144 -224 ) ( -248 144 -216 ) ( -248 -128 -224 ) skip 0 0 0 1 1
+( -248 -128 -224 ) ( -248 -128 -216 ) ( 376 -128 -224 ) skip 0 0 0 1 1
+( -248 144 -224 ) ( -248 -128 -224 ) ( 376 144 -224 ) skip 0 0 0 1 1
+( -248 -128 -216 ) ( -248 144 -216 ) ( 376 -128 -216 ) skip 0 0 0 1 1
+( 376 144 -224 ) ( 376 144 -216 ) ( -248 144 -224 ) skip 0 0 0 1 1
+( 376 -128 -224 ) ( 376 -128 -216 ) ( 376 144 -224 ) skip 0 0 0 1 1
+}
 }
 // entity 1
 {