diff --git a/GNUmakefile.in b/GNUmakefile.in
index 8d8ebc812d85fd92785379bfcbbf6478cb34ebb9..71745f59a43163f233fafa817d60b8b653ecd55e 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -160,9 +160,9 @@ distclean maintainer-clean:
 # a running server. This is what the CI pipeline runs.
 installcheck-world:
 	$(MAKE) -C src/test installcheck-good
-	$(MAKE) -C src/test/fsync install && $(MAKE) -C src/test/fsync installcheck
-	$(MAKE) -C src/test/walrep install && $(MAKE) -C src/test/walrep installcheck
-	$(MAKE) -C src/test/heap_checksum install && $(MAKE) -C src/test/heap_checksum installcheck
+	$(MAKE) -C src/test/fsync installcheck
+	$(MAKE) -C src/test/walrep installcheck
+	$(MAKE) -C src/test/heap_checksum installcheck
 	$(MAKE) -C src/test/isolation installcheck
 	$(MAKE) -C src/test/isolation2 installcheck
 	$(MAKE) -C src/pl installcheck
diff --git a/src/test/fsync/Makefile b/src/test/fsync/Makefile
index 2bf6c59a3b6976279d4d17951b5c9c43ca9354ab..a8a91babbb1ce1033af6c7285137ae39d2075435 100644
--- a/src/test/fsync/Makefile
+++ b/src/test/fsync/Makefile
@@ -11,3 +11,7 @@ include $(top_builddir)/src/Makefile.global
 
 NO_PGXS = 1
 include $(top_srcdir)/src/makefiles/pgxs.mk
+
+# Ease the top-level Makefile's job a little bit, and install supporting
+# libraries as part of installcheck.
+installcheck: install
diff --git a/src/test/heap_checksum/Makefile b/src/test/heap_checksum/Makefile
index 2b9616ddee4d815ba8268541430b041e1ab36ff6..a1520135c27489d6d6f27faf6f7e3d2d6676a708 100644
--- a/src/test/heap_checksum/Makefile
+++ b/src/test/heap_checksum/Makefile
@@ -11,3 +11,7 @@ include $(top_builddir)/src/Makefile.global
 
 NO_PGXS = 1
 include $(top_srcdir)/src/makefiles/pgxs.mk
+
+# Ease the top-level Makefile's job a little bit, and install supporting
+# libraries as part of installcheck.
+installcheck: install
diff --git a/src/test/walrep/Makefile b/src/test/walrep/Makefile
index 3ce316817373728008b27817fb67aaf45028b911..138b35942476235ee906075113c34e10d3aee87e 100644
--- a/src/test/walrep/Makefile
+++ b/src/test/walrep/Makefile
@@ -20,3 +20,7 @@ REGRESS_OPTS = --dbname="walrep_regression"
 
 NO_PGXS = 1
 include $(top_srcdir)/src/makefiles/pgxs.mk
+
+# Ease the top-level Makefile's job a little bit, and install supporting
+# libraries as part of installcheck.
+installcheck: install