diff --git a/Makefile.am b/Makefile.am
index 6d7085af36..e6112acf34 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -506,6 +506,7 @@ test_apps = \
 	tests/test_bind_after_connect_tcp \
 	tests/test_sodium \
 	tests/test_reconnect_ivl \
+	tests/test_pubsub \
 	tests/test_mock_pub_sub \
 	tests/test_socket_null \
 	tests/test_tcp_accept_filter
@@ -828,6 +829,10 @@ tests_test_reconnect_ivl_SOURCES = tests/test_reconnect_ivl.cpp
 tests_test_reconnect_ivl_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
 tests_test_reconnect_ivl_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
 
+tests_test_pubsub_SOURCES = tests/test_pubsub.cpp
+tests_test_pubsub_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
+tests_test_pubsub_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
+
 tests_test_mock_pub_sub_SOURCES = tests/test_mock_pub_sub.cpp
 tests_test_mock_pub_sub_LDADD = ${TESTUTIL_LIBS} src/libzmq.la
 tests_test_mock_pub_sub_CPPFLAGS = ${TESTUTIL_CPPFLAGS}
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d342202986..c1bda3bd74 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -75,6 +75,7 @@ set(tests
   test_reconnect_ivl
   test_reconnect_options
   test_tcp_accept_filter
+  test_pubsub
   test_mock_pub_sub)
 
 if(NOT WIN32)