diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index e8c26c1f6e8edb58d5572670088cdeff8d71b7d9..bd0f313e03808f4eba6677132c79ea5b4a8427fb 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -2673,6 +2673,19 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
 		stop_postmaster();
 	}
 
+	/*
+	 * If there were no errors, remove the temp installation immediately to
+	 * conserve disk space.  (If there were errors, we leave the installation
+	 * in place for possible manual investigation.)
+	 */
+	if (temp_install && fail_count == 0 && fail_ignore_count == 0)
+	{
+		header(_("removing temporary installation"));
+		if (!rmtree(temp_install, true))
+			fprintf(stderr, _("\n%s: could not remove temp installation \"%s\"\n"),
+					progname, temp_install);
+	}
+
 	fclose(logfile);
 
 	/*