diff --git a/contrib/test_decoding/Makefile b/contrib/test_decoding/Makefile
index 4c4452fc11e597d092a43fb5e80a04017aac5f45..98e2c33a8aecb9fe490bece1e42c5b90f016ec40 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 a7b34c69374702cadaa6577d3e637f5d240df890..a28149455c38f5215715697a7f1eaa446bc561ba 100644
--- a/src/makefiles/pgxs.mk
+++ b/src/makefiles/pgxs.mk
@@ -284,10 +284,12 @@ check:
 else
 check: submake $(REGRESS_PREP)
 	$(pg_regress_check) $(REGRESS_OPTS) $(REGRESS)
+endif
+endif # REGRESS
 
+ifndef NO_TEMP_INSTALL
 checkprep: EXTRA_INSTALL+=$(subdir)
 endif
-endif # REGRESS
 
 
 # STANDARD RULES
diff --git a/src/test/modules/snapshot_too_old/Makefile b/src/test/modules/snapshot_too_old/Makefile
index b6d998f3207582eac6c242db7442d7be607ceffd..05222e2b91aa28408c06c5a8b4eda56c63f2b2f4 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 142a1b8de2ee4db901be58d5c838f0a1c143f2e1..e31accf0f582900d45e55ead590d94cfb09d96d4 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