diff --git a/src/lib/http/tests/Makefile.am b/src/lib/http/tests/Makefile.am
index c77477c2f0..232d6e2b0c 100644
--- a/src/lib/http/tests/Makefile.am
+++ b/src/lib/http/tests/Makefile.am
@@ -50,6 +50,7 @@ libhttp_unittests_SOURCES += http_client_unittests.cc
 libhttp_unittests_SOURCES += http_server_test.h
 libhttp_unittests_SOURCES += http_server_unittests.cc
 if HAVE_OPENSSL
+libhttp_unittests_SOURCES += tls_response_creator_test.h
 libhttp_unittests_SOURCES += tls_server_unittests.cc
 libhttp_unittests_SOURCES += tls_client_unittests.cc
 endif
diff --git a/src/lib/http/tests/http_client_test.h b/src/lib/http/tests/http_client_test.h
index 6c95201aeb..90d058ef07 100644
--- a/src/lib/http/tests/http_client_test.h
+++ b/src/lib/http/tests/http_client_test.h
@@ -859,13 +859,13 @@ public:
                     io_service_->stop();
                 }
 
-                // We should have 1 connect.
+                // We should have 2 connects.
                 EXPECT_EQ(2, monitor.connect_cnt_);
                 // We should have 2 handshakes when TLS is enabled.
                 if (client_context_) {
                     EXPECT_EQ(2, monitor.handshake_cnt_);
                 }
-                // We should have 0 closes
+                // We should have 1 close.
                 EXPECT_EQ(1, monitor.close_cnt_);
                 // We should have a valid fd.
                 ASSERT_GT(monitor.registered_fd_, -1);
diff --git a/src/lib/http/tests/http_server_test.h b/src/lib/http/tests/http_server_test.h
index 999869930c..a87c411a1a 100644
--- a/src/lib/http/tests/http_server_test.h
+++ b/src/lib/http/tests/http_server_test.h
@@ -545,7 +545,7 @@ public:
         ASSERT_TRUE(client->isConnectionAlive());
 
         // Run IO service for 1000ms. The idle time is set to 500ms, so
-        // the connection should be closed by the server while we  wait here.
+        // the connection should be closed by the server while we wait here.
         runIOService(1000);
 
         // Make sure the connection has been closed.
diff --git a/src/lib/http/tests/tls_server_unittests.cc b/src/lib/http/tests/tls_server_unittests.cc
index be2592aac3..e8cabfb248 100644
--- a/src/lib/http/tests/tls_server_unittests.cc
+++ b/src/lib/http/tests/tls_server_unittests.cc
@@ -78,7 +78,6 @@ TEST_F(HttpsListenerTest, listen) {
     testListen();
 }
 
-
 // This test verifies that persistent HTTP connection can be established when
 // "Connection: Keep-Alive" header value is specified.
 TEST_F(HttpsListenerTest, keepAlive) {