diff --git a/lib/Makefile.am b/lib/Makefile.am
index 497ec4e4..cf467d80 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -55,7 +55,10 @@ endif
 
 libwebsockets_la_CFLAGS+= -c \
 	-DINSTALL_DATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
+if NO_EXTENSIONS
+else
 libwebsockets_la_LDFLAGS+= -lz
+endif
 
 all-local:
 	 ../scripts/kernel-doc -html \
diff --git a/test-server/Makefile.am b/test-server/Makefile.am
index 4dda7709..73136186 100644
--- a/test-server/Makefile.am
+++ b/test-server/Makefile.am
@@ -18,21 +18,21 @@ if NO_SERVER
 else
 libwebsockets_test_server_SOURCES=test-server.c
 libwebsockets_test_server_CFLAGS=
-libwebsockets_test_server_LDADD=-L../lib -lwebsockets -lz
+libwebsockets_test_server_LDADD=-L../lib -lwebsockets
 libwebsockets_test_server_extpoll_SOURCES=test-server.c
 libwebsockets_test_server_extpoll_CFLAGS=$(AM_CFLAGS) -DEXTERNAL_POLL
-libwebsockets_test_server_extpoll_LDADD=-L../lib -lwebsockets -lz
+libwebsockets_test_server_extpoll_LDADD=-L../lib -lwebsockets
 endif
 if NO_CLIENT
 else
 libwebsockets_test_client_SOURCES=test-client.c
 libwebsockets_test_client_CFLAGS=
-libwebsockets_test_client_LDADD=-L../lib -lwebsockets -lz
+libwebsockets_test_client_LDADD=-L../lib -lwebsockets
 if NO_SERVER
 else
 libwebsockets_test_fraggle_SOURCES=test-fraggle.c
 libwebsockets_test_fraggle_CFLAGS=
-libwebsockets_test_fraggle_LDADD=-L../lib -lwebsockets -lz
+libwebsockets_test_fraggle_LDADD=-L../lib -lwebsockets
 endif
 endif