diff --git a/testmaps/qbsp_q2_skip.map b/testmaps/qbsp_q2_skip.map
new file mode 100644
index 00000000..78974129
--- /dev/null
+++ b/testmaps/qbsp_q2_skip.map
@@ -0,0 +1,76 @@
+// Game: Quake 2
+// Format: Quake2
+// entity 0
+{
+"classname" "worldspawn"
+"_tb_textures" "textures/e1u1"
+"message" "Water brush has SKIP flag on the top face, makign it extend up to the ceiling"
+// brush 0
+{
+( 48 160 160 ) ( 48 -64 160 ) ( 48 160 -16 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( 64 -64 -16 ) ( 48 -64 -16 ) ( 64 -64 160 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( 64 160 -16 ) ( 48 160 -16 ) ( 64 -64 -16 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( 64 -64 160 ) ( 48 -64 160 ) ( 64 160 160 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( 64 160 160 ) ( 48 160 160 ) ( 64 160 -16 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( 64 -64 160 ) ( 64 160 160 ) ( 64 -64 -16 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+}
+// brush 1
+{
+( -192 -64 -16 ) ( -192 160 -16 ) ( -192 -64 160 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( -192 -64 160 ) ( -176 -64 160 ) ( -192 -64 -16 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( -192 -64 -16 ) ( -176 -64 -16 ) ( -192 160 -16 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( -192 160 160 ) ( -176 160 160 ) ( -192 -64 160 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( -192 160 -16 ) ( -176 160 -16 ) ( -192 160 160 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( -176 -64 -16 ) ( -176 -64 160 ) ( -176 160 -16 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+}
+// brush 2
+{
+( -176 160 160 ) ( -176 144 160 ) ( -176 160 -16 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( 48 144 160 ) ( 48 144 -16 ) ( -176 144 160 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( -176 160 -16 ) ( -176 144 -16 ) ( 48 160 -16 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( 48 160 160 ) ( 48 144 160 ) ( -176 160 160 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( 48 160 160 ) ( -176 160 160 ) ( 48 160 -16 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( 48 160 -16 ) ( 48 144 -16 ) ( 48 160 160 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+}
+// brush 3
+{
+( -176 -64 -16 ) ( -176 -48 -16 ) ( -176 -64 160 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( 48 -64 -16 ) ( -176 -64 -16 ) ( 48 -64 160 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( 48 -64 -16 ) ( 48 -48 -16 ) ( -176 -64 -16 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( -176 -64 160 ) ( -176 -48 160 ) ( 48 -64 160 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( -176 -48 -16 ) ( 48 -48 -16 ) ( -176 -48 160 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( 48 -64 160 ) ( 48 -48 160 ) ( 48 -64 -16 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+}
+// brush 4
+{
+( -176 -48 160 ) ( -176 -48 144 ) ( -176 144 160 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( 48 -48 160 ) ( 48 -48 144 ) ( -176 -48 160 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( 48 144 144 ) ( -176 144 144 ) ( 48 -48 144 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( 48 144 160 ) ( 48 -48 160 ) ( -176 144 160 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( -176 144 160 ) ( -176 144 144 ) ( 48 144 160 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( 48 144 160 ) ( 48 144 144 ) ( 48 -48 160 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+}
+// brush 5
+{
+( -176 144 -16 ) ( -176 144 0 ) ( -176 -48 -16 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( -176 -48 -16 ) ( -176 -48 0 ) ( 48 -48 -16 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( -176 144 -16 ) ( -176 -48 -16 ) ( 48 144 -16 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( -176 -48 0 ) ( -176 144 0 ) ( 48 -48 0 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( 48 144 -16 ) ( 48 144 0 ) ( -176 144 -16 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+( 48 -48 -16 ) ( 48 -48 0 ) ( 48 144 -16 ) e1u1/color1_6 0 0 0 1 1 0 0 0
+}
+// brush 6
+{
+( 0 48 0 ) ( 0 49 0 ) ( 0 48 1 ) e1u1/water4 0 0 0 1 1 32 24 0
+( 0 48 0 ) ( 0 48 1 ) ( 1 48 0 ) e1u1/water4 0 0 0 1 1 32 24 0
+( 0 48 0 ) ( 1 48 0 ) ( 0 49 0 ) e1u1/water4 0 0 0 1 1 32 24 0
+( 48 96 16 ) ( 48 97 16 ) ( 49 96 16 ) e1u1/water4 0 0 0 1 1 32 512 0
+( 48 96 16 ) ( 49 96 16 ) ( 48 96 17 ) e1u1/water4 0 0 0 1 1 32 24 0
+( 48 96 16 ) ( 48 96 17 ) ( 48 97 16 ) e1u1/water4 0 0 0 1 1 32 24 0
+}
+}
+// entity 1
+{
+"classname" "info_player_start"
+"origin" "-128 -16 24"
+}