diff --git a/tests/src/connect_spec.cpp b/tests/src/connect_spec.cpp
index 4f85655..16d967d 100644
--- a/tests/src/connect_spec.cpp
+++ b/tests/src/connect_spec.cpp
@@ -6,7 +6,6 @@
 
 
 byte server[] = { 172, 16, 0, 2 };
-byte server2[] = { 172, 16, 0, 2 };
 
 void callback(char* topic, byte* payload, unsigned int length) {
   // handle message arrived
@@ -178,7 +177,7 @@ int test_connect_with_will_username_password() {
 int main()
 {
     test_connect_fails_no_network();
-    //test_connect_fails_on_no_response();
+    test_connect_fails_on_no_response();
     test_connect_properly_formatted();
     test_connect_fails_on_bad_rc();
     test_connect_properly_formatted_hostname();
diff --git a/tests/src/publish_spec.cpp b/tests/src/publish_spec.cpp
new file mode 100644
index 0000000..fcf943a
--- /dev/null
+++ b/tests/src/publish_spec.cpp
@@ -0,0 +1,113 @@
+#include "PubSubClient.h"
+#include "ShimClient.h"
+#include "Buffer.h"
+#include "BDDTest.h"
+#include "trace.h"
+
+
+byte server[] = { 172, 16, 0, 2 };
+
+void callback(char* topic, byte* payload, unsigned int length) {
+  // handle message arrived
+}
+
+int test_publish() {
+    IT("publishes a null-terminated string");
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+    
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.respond(connack,4);
+    
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1");
+    IS_TRUE(rc);
+    
+    byte publish[] = {0x30,0xe,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x70,0x61,0x79,0x6c,0x6f,0x61,0x64};
+    shimClient.expect(publish,16);
+    
+    rc = client.publish((char*)"topic",(char*)"payload");
+    IS_TRUE(rc);
+    
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+
+int test_publish_bytes() {
+    IT("publishes a byte array");
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+    
+    byte payload[] = { 0x01,0x02,0x03,0x0,0x05 };
+    int length = 5;
+    
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.respond(connack,4);
+    
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1");
+    IS_TRUE(rc);
+    
+    byte publish[] = {0x30,0xc,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x1,0x2,0x3,0x0,0x5};
+    shimClient.expect(publish,14);
+    
+    rc = client.publish((char*)"topic",payload,length);
+    IS_TRUE(rc);
+    
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+
+int test_publish_retained() {
+    IT("publishes retained");
+    ShimClient shimClient;
+    shimClient.setAllowConnect(true);
+    
+    byte payload[] = { 0x01,0x02,0x03,0x0,0x05 };
+    int length = 5;
+    
+    byte connack[] = { 0x20, 0x02, 0x00, 0x00 };
+    shimClient.respond(connack,4);
+    
+    PubSubClient client(server, 1883, callback, shimClient);
+    int rc = client.connect((char*)"client_test1");
+    IS_TRUE(rc);
+    
+    byte publish[] = {0x31,0xc,0x0,0x5,0x74,0x6f,0x70,0x69,0x63,0x1,0x2,0x3,0x0,0x5};
+    shimClient.expect(publish,14);
+    
+    rc = client.publish((char*)"topic",payload,length,true);
+    IS_TRUE(rc);
+    
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+int test_publish_not_connected() {
+    IT("publish fails when not connected");
+    ShimClient shimClient;
+    
+    PubSubClient client(server, 1883, callback, shimClient);
+    
+    int rc = client.publish((char*)"topic",(char*)"payload");
+    IS_FALSE(rc);
+    
+    IS_FALSE(shimClient.error());
+
+    END_IT
+}
+
+int main()
+{
+    test_publish();
+    test_publish_bytes();
+    test_publish_retained();
+    test_publish_not_connected();
+    
+    FINISH
+}