diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index 8e1c49576..7e9663d48 100644
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -140,7 +140,7 @@ test1168 test1170 test1171 test1172 test1173 test1174 test1175 \
test1176 test1177 test1178 test1179 \
\
test1190 test1191 test1192 test1193 test1194 test1195 test1196 test1197 \
-\
+test1198 test1199 \
test1200 test1201 test1202 test1203 test1204 test1205 test1206 test1207 \
test1208 test1209 test1210 test1211 test1212 test1213 test1214 test1215 \
test1216 test1217 test1218 test1219 test1220 test1223 \
diff --git a/tests/data/test1198 b/tests/data/test1198
new file mode 100644
index 000000000..deb22906b
--- /dev/null
+++ b/tests/data/test1198
@@ -0,0 +1,54 @@
+
+
+
+MQTT
+MQTT SUBSCRIBE
+
+
+
+#
+# Server-side
+
+
+hello
+
+
+00 04 31 31 39 30 68 65 6c 6c 6f 5b 4c 46 5d 0a
+
+
+
+#
+# Client-side
+
+
+mqtt
+
+
+mqtt
+
+
+MQTT PUBLISH empty payload, single space topic
+
+
+"mqtt:/%HOSTIP:%MQTTPORT/ " -d ""
+
+
+
+#
+# Verify data after the test has been "shot"
+
+# These are hexadecimal protocol dumps from the client
+#
+# Strip out the random part of the client id from the CONNECT message
+# before comparison
+
+s/^(.* 00044d5154540402003c000c6375726c).*/$1/
+
+
+client CONNECT 18 00044d5154540402003c000c6375726c
+server CONNACK 2 20020000
+client PUBLISH 3 000120
+client DISCONNECT 0 e000
+
+
+
diff --git a/tests/data/test1199 b/tests/data/test1199
new file mode 100644
index 000000000..6887c576b
--- /dev/null
+++ b/tests/data/test1199
@@ -0,0 +1,55 @@
+
+
+
+MQTT
+MQTT SUBSCRIBE
+
+
+
+#
+# Server-side
+
+
+hello
+
+
+00 04 31 31 39 30 68 65 6c 6c 6f 5b 4c 46 5d 0a
+
+
+
+#
+# Client-side
+
+
+mqtt
+
+
+mqtt
+
+
+MQTT PUBLISH empty payload, no topic
+
+
+"mqtt:/%HOSTIP:%MQTTPORT/" -d ""
+
+
+
+#
+# Verify data after the test has been "shot"
+
+# These are hexadecimal protocol dumps from the client
+#
+# Strip out the random part of the client id from the CONNECT message
+# before comparison
+
+s/^(.* 00044d5154540402003c000c6375726c).*/$1/
+
+
+client CONNECT 18 00044d5154540402003c000c6375726c
+server CONNACK 2 20020000
+
+
+3
+
+
+