diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index e66688dbb3..557ce84a68 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -4,19 +4,16 @@ SUBDIRS = . mcconfig search strutil vfs widget
 
 AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) @CHECK_CFLAGS@
 
-LIBS = @CHECK_LIBS@ \
-	$(top_builddir)/lib/libmc.la
-
-if ENABLE_MCLIB
-LIBS += $(GLIB_LIBS) \
-	@E2P_LIBS@
-endif
+LDADD = \
+	$(top_builddir)/lib/libmc.la \
+	@CHECK_LIBS@
 
 EXTRA_DIST = utilunix__my_system-common.c
 
 TESTS = \
 	library_independ \
 	mc_build_filename \
+	mc_realpath \
 	name_quote \
 	serialize \
 	terminal \
@@ -27,8 +24,6 @@ TESTS = \
 	utilunix__my_system_fork_child \
 	x_basename
 
-TESTS += mc_realpath
-
 check_PROGRAMS = $(TESTS)
 
 library_independ_SOURCES = \
diff --git a/tests/lib/mcconfig/Makefile.am b/tests/lib/mcconfig/Makefile.am
index 97e41912b5..f76852cae1 100644
--- a/tests/lib/mcconfig/Makefile.am
+++ b/tests/lib/mcconfig/Makefile.am
@@ -6,13 +6,9 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	@CHECK_CFLAGS@
 
-LIBS = @CHECK_LIBS@ \
-	$(top_builddir)/lib/libmc.la
-
-if ENABLE_MCLIB
-LIBS += $(GLIB_LIBS) \
-	@E2P_LIBS@
-endif
+LDADD = \
+	$(top_builddir)/lib/libmc.la \
+	@CHECK_LIBS@
 
 TESTS = \
 	config_string \
diff --git a/tests/lib/search/Makefile.am b/tests/lib/search/Makefile.am
index c3296abcdc..efc9be2e70 100644
--- a/tests/lib/search/Makefile.am
+++ b/tests/lib/search/Makefile.am
@@ -6,12 +6,9 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/search \
 	@CHECK_CFLAGS@
 
-LIBS = @CHECK_LIBS@ \
-	$(top_builddir)/lib/libmc.la
-
-if ENABLE_MCLIB
-LIBS += $(GLIB_LIBS)
-endif
+LDADD = \
+	$(top_builddir)/lib/libmc.la \
+	@CHECK_LIBS@
 
 TESTS = \
 	glob_prepare_replace_str \
diff --git a/tests/lib/strutil/Makefile.am b/tests/lib/strutil/Makefile.am
index a7dfb0a681..cb127548db 100644
--- a/tests/lib/strutil/Makefile.am
+++ b/tests/lib/strutil/Makefile.am
@@ -5,12 +5,9 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	@CHECK_CFLAGS@
 
-LIBS = @CHECK_LIBS@ \
-	$(top_builddir)/lib/libmc.la
-
-if ENABLE_MCLIB
-LIBS += $(GLIB_LIBS)
-endif
+LDADD = \
+	$(top_builddir)/lib/libmc.la \
+	@CHECK_LIBS@
 
 TESTS = \
 	parse_integer \
diff --git a/tests/lib/vfs/Makefile.am b/tests/lib/vfs/Makefile.am
index 892614fa8b..aa1f7fe8bc 100644
--- a/tests/lib/vfs/Makefile.am
+++ b/tests/lib/vfs/Makefile.am
@@ -11,13 +11,9 @@ EXTRA_DIST = mc.charsets.in
 
 CLEANFILES = mc.charsets
 
-LIBS = @CHECK_LIBS@ \
-	$(top_builddir)/lib/libmc.la
-
-if ENABLE_MCLIB
-LIBS += $(GLIB_LIBS) \
-	@E2P_LIBS@
-endif
+LDADD = \
+	$(top_builddir)/lib/libmc.la \
+	@CHECK_LIBS@
 
 TESTS = \
 	canonicalize_pathname \
diff --git a/tests/lib/widget/Makefile.am b/tests/lib/widget/Makefile.am
index f4d51ddcac..cccfa861e2 100644
--- a/tests/lib/widget/Makefile.am
+++ b/tests/lib/widget/Makefile.am
@@ -6,12 +6,9 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/vfs \
 	@CHECK_CFLAGS@
 
-LIBS = @CHECK_LIBS@ \
-	$(top_builddir)/lib/libmc.la
-
-if ENABLE_MCLIB
-LIBS += $(GLIB_LIBS)
-endif
+LDADD = \
+	$(top_builddir)/lib/libmc.la \
+	@CHECK_LIBS@
 
 TESTS = \
 	complete_engine \
diff --git a/tests/src/Makefile.am b/tests/src/Makefile.am
index 1bffc91d0f..949bfbc8ff 100644
--- a/tests/src/Makefile.am
+++ b/tests/src/Makefile.am
@@ -13,13 +13,10 @@ AM_CPPFLAGS = \
 	-DTEST_SHARE_DIR=\"$(abs_srcdir)/fixtures\" \
 	@CHECK_CFLAGS@
 
-LIBS = @CHECK_LIBS@ \
+LDADD = \
 	$(top_builddir)/src/libinternal.la \
-	$(top_builddir)/lib/libmc.la
-
-if ENABLE_MCLIB
-LIBS += $(GLIB_LIBS)
-endif
+	$(top_builddir)/lib/libmc.la \
+	@CHECK_LIBS@
 
 EXTRA_DIST = \
 	fixtures/mc.charsets \
diff --git a/tests/src/editor/Makefile.am b/tests/src/editor/Makefile.am
index c280a3c9d2..5172d2b42d 100644
--- a/tests/src/editor/Makefile.am
+++ b/tests/src/editor/Makefile.am
@@ -6,13 +6,10 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	@CHECK_CFLAGS@
 
-LIBS = @CHECK_LIBS@ \
+LDADD = \
 	$(top_builddir)/src/libinternal.la \
-	$(top_builddir)/lib/libmc.la
-
-if ENABLE_MCLIB
-LIBS += $(GLIB_LIBS)
-endif
+	$(top_builddir)/lib/libmc.la \
+	@CHECK_LIBS@
 
 EXTRA_DIST = edit_complete_word_cmd_test_data.txt.in
 
diff --git a/tests/src/filemanager/Makefile.am b/tests/src/filemanager/Makefile.am
index 656ebfdf8b..ee89d0e8e5 100644
--- a/tests/src/filemanager/Makefile.am
+++ b/tests/src/filemanager/Makefile.am
@@ -7,13 +7,10 @@ AM_CPPFLAGS = \
 	-DTEST_SHARE_DIR=\"$(abs_srcdir)/../fixtures\" \
 	@CHECK_CFLAGS@
 
-LIBS = @CHECK_LIBS@ \
+LDADD = \
 	$(top_builddir)/src/libinternal.la \
-	$(top_builddir)/lib/libmc.la
-
-if ENABLE_MCLIB
-LIBS += $(GLIB_LIBS)
-endif
+	$(top_builddir)/lib/libmc.la \
+	@CHECK_LIBS@
 
 TESTS = \
 	cd_to \
diff --git a/tests/src/vfs/extfs/helpers-list/Makefile.am b/tests/src/vfs/extfs/helpers-list/Makefile.am
index b095442660..05d3d69293 100644
--- a/tests/src/vfs/extfs/helpers-list/Makefile.am
+++ b/tests/src/vfs/extfs/helpers-list/Makefile.am
@@ -4,11 +4,8 @@ SUBDIRS = misc
 
 AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir)
 
-LIBS = $(top_builddir)/lib/libmc.la
-
-if ENABLE_MCLIB
-LIBS += $(GLIB_LIBS)
-endif
+LDADD = \
+	$(top_builddir)/lib/libmc.la
 
 # Programs/scripts to build on 'make check'.
 check_PROGRAMS = mc_parse_ls_l
diff --git a/tests/src/vfs/ftpfs/Makefile.am b/tests/src/vfs/ftpfs/Makefile.am
index c44c676955..dc2182af23 100644
--- a/tests/src/vfs/ftpfs/Makefile.am
+++ b/tests/src/vfs/ftpfs/Makefile.am
@@ -7,13 +7,10 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/vfs \
 	@CHECK_CFLAGS@
 
-LIBS = @CHECK_LIBS@ \
+LDADD = \
 	$(top_builddir)/src/libinternal.la \
-	$(top_builddir)/lib/libmc.la
-
-if ENABLE_MCLIB
-LIBS += $(GLIB_LIBS)
-endif
+	$(top_builddir)/lib/libmc.la \
+	@CHECK_LIBS@
 
 EXTRA_DIST = \
 	data/aix_list.input \