diff --git a/tests/auth/Makefile.in b/tests/auth/Makefile.in
index df73ed4dbb..9e43b4c515 100644
--- a/tests/auth/Makefile.in
+++ b/tests/auth/Makefile.in
@@ -10,25 +10,24 @@ MODULE_CFLAGS=-I$(TOP_OBJDIR) -I$(srcdir)/../common/
 
 all: $(BINS)
 
-MODULE_LIBS = 	$(abs_top_builddir)/tests/common/libafstest_common.la \
-		$(abs_top_builddir)/src/auth/liboafs_auth.la \
-		$(XLIBS)
+LIBS = $(abs_top_builddir)/tests/common/libafstest_common.la \
+	  $(abs_top_builddir)/src/auth/liboafs_auth.la
 
-authcon-t: authcon-t.o
-	$(LT_LDRULE_static) authcon-t.o $(MODULE_LIBS)
+authcon-t: authcon-t.o $(LIBS)
+	$(LT_LDRULE_static) authcon-t.o $(LIBS) $(XLIBS)
 
-superuser-t: superuser-t.o test.cs.o test.ss.o test.xdr.o
+superuser-t: superuser-t.o test.cs.o test.ss.o test.xdr.o $(LIBS)
 	$(LT_LDRULE_static) superuser-t.o test.cs.o test.ss.o test.xdr.o \
-		$(MODULE_LIBS)
+		$(LIBS) $(XLIBS)
 
-keys-t: keys-t.o
-	$(LT_LDRULE_static) keys-t.o $(MODULE_LIBS)
+keys-t: keys-t.o $(LIBS)
+	$(LT_LDRULE_static) keys-t.o $(LIBS) $(XLIBS)
 
-realms-t: realms-t.o
-	$(LT_LDRULE_static) realms-t.o $(MODULE_LIBS)
+realms-t: realms-t.o $(LIBS)
+	$(LT_LDRULE_static) realms-t.o $(LIBS) $(XLIBS)
 
-writekeyfile: writekeyfile.o
-	$(LT_LDRULE_static) writekeyfile.o $(MODULE_LIBS)
+writekeyfile: writekeyfile.o $(LIBS)
+	$(LT_LDRULE_static) writekeyfile.o $(LIBS) $(XLIBS)
 
 test.cs.c: test.xg
 	$(RXGEN) -A -x -C -o $@ $(srcdir)/test.xg
diff --git a/tests/opr/Makefile.in b/tests/opr/Makefile.in
index 33a7cd5b90..91763dab69 100644
--- a/tests/opr/Makefile.in
+++ b/tests/opr/Makefile.in
@@ -19,7 +19,7 @@ cache-t: cache-t.o $(LIBS)
 dict-t: dict-t.o $(LIBS)
 	$(LT_LDRULE_static) dict-t.o $(LIBS) $(XLIBS)
 
-fmt-t: fmt-t.o
+fmt-t: fmt-t.o $(LIBS)
 	$(LT_LDRULE_static) fmt-t.o $(LIBS) $(XLIBS)
 
 queues-t: queues-t.o $(LIBS)
@@ -28,13 +28,13 @@ queues-t: queues-t.o $(LIBS)
 rbtree-t: rbtree-t.o $(LIBS)
 	$(LT_LDRULE_static) rbtree-t.o $(LIBS) $(XLIBS)
 
-jhash-t: jhash-t.o
+jhash-t: jhash-t.o $(LIBS)
 	$(LT_LDRULE_static) jhash-t.o $(LIBS) $(XLIBS)
 
-time-t: time-t.o
+time-t: time-t.o $(LIBS)
 	$(LT_LDRULE_static) time-t.o $(LIBS) $(XLIBS)
 
-uuid-t: uuid-t.o
+uuid-t: uuid-t.o $(LIBS)
 	$(LT_LDRULE_static) uuid-t.o $(LIBS) $(XLIBS)
 
 softsig-helper: softsig-helper.o $(LIBS)
diff --git a/tests/volser/Makefile.in b/tests/volser/Makefile.in
index 342b1b6983..9673b79b27 100644
--- a/tests/volser/Makefile.in
+++ b/tests/volser/Makefile.in
@@ -10,12 +10,11 @@ MODULE_CFLAGS=-I$(TOP_OBJDIR) -I$(srcdir)/../common/
 
 all: $(BINS)
 
-MODULE_LIBS = 	$(abs_top_builddir)/tests/common/libafstest_common.la \
-		$(abs_top_builddir)/src/vlserver/liboafs_vldb.la \
-		$(XLIBS)
+LIBS = 	$(abs_top_builddir)/tests/common/libafstest_common.la \
+	$(abs_top_builddir)/src/vlserver/liboafs_vldb.la
 
-vos-t: vos-t.o
-	$(LT_LDRULE_static) vos-t.o $(MODULE_LIBS)
+vos-t: vos-t.o $(LIBS)
+	$(LT_LDRULE_static) vos-t.o $(LIBS) $(XLIBS)
 
 clean:
 	$(LT_CLEAN)