diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
index 94a4103..3f1486b 100644
--- a/server/tests/Makefile.am
+++ b/server/tests/Makefile.am
@@ -19,7 +19,6 @@ AM_CPPFLAGS += -DAUTOMATED_TESTS
 endif
 
 LDADD =								\
-	$(GLIB2_LIBS)						\
 	$(top_builddir)/spice-common/common/libspice-common.la	\
 	$(top_builddir)/server/libspice-server.la		\
 	$(GLIB2_LIBS)						\
@@ -52,11 +51,11 @@ TESTS =	\
 
 check_PROGRAMS = $(TESTS)
 
-noinst_LIBRARIES = \
-	libstat_test1.a \
-	libstat_test2.a \
-	libstat_test3.a \
-	libstat_test4.a \
+noinst_LTLIBRARIES = \
+	libstat_test1.la \
+	libstat_test2.la \
+	libstat_test3.la \
+	libstat_test4.la \
 	$(NULL)
 
 test_vdagent_SOURCES =		\
@@ -127,21 +126,21 @@ spice_server_replay_SOURCES = 			\
 
 stat_test_SOURCES = stat-main.c
 stat_test_LDADD = \
+	libstat_test1.la \
+	libstat_test2.la \
+	libstat_test3.la \
+	libstat_test4.la \
 	$(LDADD) \
-	libstat_test1.a \
-	libstat_test2.a \
-	libstat_test3.a \
-	libstat_test4.a \
 	$(NULL)
 
-libstat_test1_a_SOURCES = stat-test.c
-libstat_test1_a_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_COMPRESS_STAT=0 -DTEST_RED_WORKER_STAT=0 -DTEST_NAME=stat_test1
+libstat_test1_la_SOURCES = stat-test.c
+libstat_test1_la_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_COMPRESS_STAT=0 -DTEST_RED_WORKER_STAT=0 -DTEST_NAME=stat_test1
 
-libstat_test2_a_SOURCES = stat-test.c
-libstat_test2_a_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_COMPRESS_STAT=0 -DTEST_RED_WORKER_STAT=1 -DTEST_NAME=stat_test2
+libstat_test2_la_SOURCES = stat-test.c
+libstat_test2_la_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_COMPRESS_STAT=0 -DTEST_RED_WORKER_STAT=1 -DTEST_NAME=stat_test2
 
-libstat_test3_a_SOURCES = stat-test.c
-libstat_test3_a_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_COMPRESS_STAT=1 -DTEST_RED_WORKER_STAT=0 -DTEST_NAME=stat_test3
+libstat_test3_la_SOURCES = stat-test.c
+libstat_test3_la_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_COMPRESS_STAT=1 -DTEST_RED_WORKER_STAT=0 -DTEST_NAME=stat_test3
 
-libstat_test4_a_SOURCES = stat-test.c
-libstat_test4_a_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_COMPRESS_STAT=1 -DTEST_RED_WORKER_STAT=1 -DTEST_NAME=stat_test4
+libstat_test4_la_SOURCES = stat-test.c
+libstat_test4_la_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_COMPRESS_STAT=1 -DTEST_RED_WORKER_STAT=1 -DTEST_NAME=stat_test4