diff --git a/Makefile.am b/Makefile.am
index 7e01e90..de4efa1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,6 +42,8 @@ EXTRA_DIST =	pkg.m4 \
 		t/basic/exists-version-with-tilde.test \
 		t/basic/incomplete-cflags.test \
 		t/basic/incomplete-libs.test \
+		t/basic/keep-system-libs.test \
+		t/basic/keep-system-libs-2.test \
 		t/basic/libs.test \
 		t/basic/libs-cflags.test \
 		t/basic/libs-cflags-version.test \
diff --git a/t/basic/keep-system-libs-2.test b/t/basic/keep-system-libs-2.test
new file mode 100644
index 0000000..c83dccd
--- /dev/null
+++ b/t/basic/keep-system-libs-2.test
@@ -0,0 +1,4 @@
+Environment: PKG_CONFIG_SYSTEM_LIBRARY_PATH=/test/local/lib
+PackageSearchPath: lib1
+WantedFlags: libs-only-ldpath keep-system-libs
+Query: cflags-libs-only
diff --git a/t/basic/keep-system-libs.test b/t/basic/keep-system-libs.test
new file mode 100644
index 0000000..bf85719
--- /dev/null
+++ b/t/basic/keep-system-libs.test
@@ -0,0 +1,6 @@
+Environment: PKG_CONFIG_SYSTEM_LIBRARY_PATH=/test/local/lib
+PackageSearchPath: lib1
+WantedFlags: libs-only-ldpath
+ExpectedStdout: 
+MatchStdout: empty
+Query: cflags-libs-only
diff --git a/tests/regress.sh b/tests/regress.sh
index 8775c2a..73bee0f 100755
--- a/tests/regress.sh
+++ b/tests/regress.sh
@@ -7,7 +7,6 @@ tests_init \
 	define_variable \
 	define_variable_override \
 	duplicate_tuple_upsert \
-	keep_system_libs \
 	libs \
 	libs_only \
 	libs_never_mergeback \
@@ -62,19 +61,6 @@ duplicate_tuple_upsert_body()
 		pkgconf --variable=prefix --with-path=${selfdir}/lib1 duplicate-tuple
 }
 
-keep_system_libs_body()
-{
-	export PKG_CONFIG_PATH="${selfdir}/lib1"
-	eval export "$LIBRARY_PATH_ENV"="/test/local/lib"
-	atf_check \
-		-o inline:"\n" \
-		pkgconf --libs-only-L cflags-libs-only
-
-	atf_check \
-		-o inline:"-L/test/local/lib\n" \
-		pkgconf --libs-only-L --keep-system-libs cflags-libs-only
-}
-
 libs_body()
 {
 	export PKG_CONFIG_PATH="${selfdir}/lib1"