diff --git a/contrib/test_decoding/Makefile b/contrib/test_decoding/Makefile
index 4c4452fc11e..98e2c33a8ae 100644
--- a/contrib/test_decoding/Makefile
+++ b/contrib/test_decoding/Makefile
@@ -65,5 +65,3 @@ isolationcheck-install-force: all | submake-isolation submake-test_decoding temp
 .PHONY: submake-test_decoding submake-regress check \
 	regresscheck regresscheck-install-force \
 	isolationcheck isolationcheck-install-force
-
-temp-install: EXTRA_INSTALL=contrib/test_decoding
diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk
index a7b34c69374..a28149455c3 100644
--- a/src/makefiles/pgxs.mk
+++ b/src/makefiles/pgxs.mk
@@ -284,11 +284,13 @@ check:
 else
 check: submake $(REGRESS_PREP)
 	$(pg_regress_check) $(REGRESS_OPTS) $(REGRESS)
-
-checkprep: EXTRA_INSTALL+=$(subdir)
 endif
 endif # REGRESS
 
+ifndef NO_TEMP_INSTALL
+checkprep: EXTRA_INSTALL+=$(subdir)
+endif
+
 
 # STANDARD RULES
 
diff --git a/src/test/modules/snapshot_too_old/Makefile b/src/test/modules/snapshot_too_old/Makefile
index b6d998f3207..05222e2b91a 100644
--- a/src/test/modules/snapshot_too_old/Makefile
+++ b/src/test/modules/snapshot_too_old/Makefile
@@ -43,5 +43,3 @@ isolationcheck-install-force: all | submake-isolation submake-test_snapshot_too_
 	    $(ISOLATIONCHECKS)
 
 .PHONY: check submake-test_snapshot_too_old isolationcheck isolationcheck-install-force
-
-temp-install: EXTRA_INSTALL=src/test/modules/snapshot_too_old
diff --git a/src/test/recovery/Makefile b/src/test/recovery/Makefile
index 142a1b8de2e..e31accf0f58 100644
--- a/src/test/recovery/Makefile
+++ b/src/test/recovery/Makefile
@@ -20,5 +20,3 @@ check:
 
 clean distclean maintainer-clean:
 	rm -rf tmp_check
-
-EXTRA_INSTALL = contrib/test_decoding