diff --git a/src/test/regress/expected/Makefile b/src/test/regress/expected/Makefile
index c72b7f431869a22bfe038bcc05dc7cb4914d661c..285abb2c16000d6a5052fee1e21399fd1d271007 100644
--- a/src/test/regress/expected/Makefile
+++ b/src/test/regress/expected/Makefile
@@ -1,17 +1,17 @@
 #-------------------------------------------------------------------------
 #
 # Makefile--
-#    Makefile for regress (the regression test)
+#    Makefile for regress/expected (the regression test)
 #
 # Copyright (c) 1994, Regents of the University of California
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/test/regress/expected/Attic/Makefile,v 1.4 1998/09/29 12:40:52 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/test/regress/expected/Attic/Makefile,v 1.5 2000/01/09 19:34:41 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
-CLFILES=	create_function_1.out create_function_2.out copy.out constraints.out misc.out install_plpgsql.out
+CLFILES=	create_function_1.out create_function_2.out copy.out constraints.out misc.out
 
 clean:
 	rm -f $(CLFILES)
diff --git a/src/test/regress/input/Makefile b/src/test/regress/input/Makefile
index 9a00fc5e4f8039e7e8af8a4d6ec4b74288756112..d160291023529257faea18c031a3c78de62d1fdd 100644
--- a/src/test/regress/input/Makefile
+++ b/src/test/regress/input/Makefile
@@ -1,13 +1,13 @@
 #-------------------------------------------------------------------------
 #
 # Makefile--
-#    Makefile for regress (the regression test)
+#    Makefile for regress/input (the regression test)
 #
 # Copyright (c) 1994, Regents of the University of California
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/test/regress/input/Attic/Makefile,v 1.7 1998/09/29 12:41:56 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/test/regress/input/Attic/Makefile,v 1.8 2000/01/09 19:34:40 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -22,8 +22,7 @@ INFILES= copy.sql \
          create_function_1.sql \
          create_function_2.sql \
          misc.sql \
-	 constraints.sql \
-	 install_plpgsql.sql
+	 constraints.sql
 
 all: $(INFILES)
 
diff --git a/src/test/regress/input/install_plpgsql.source b/src/test/regress/input/install_plpgsql.source
deleted file mode 100644
index d163d0f4947ebe8030cc2e745aec6e7142b2859f..0000000000000000000000000000000000000000
--- a/src/test/regress/input/install_plpgsql.source
+++ /dev/null
@@ -1,13 +0,0 @@
---
--- INSTALL_PLPGSQL
---
-
-CREATE FUNCTION plpgsql_call_handler()
-   RETURNS opaque
-   AS '_LIBDIR_/plpgsql_DLSUFFIX_'
-   LANGUAGE 'c';
-
-CREATE TRUSTED PROCEDURAL LANGUAGE 'plpgsql'
-   HANDLER plpgsql_call_handler
-   LANCOMPILER 'PL/pgSQL';
-
diff --git a/src/test/regress/output/Makefile b/src/test/regress/output/Makefile
index a31c6c4b6ab67530fc54267c74e868867cbd14b6..2a4f1b913059f4339cc4f709352b7998cfb27e31 100644
--- a/src/test/regress/output/Makefile
+++ b/src/test/regress/output/Makefile
@@ -1,13 +1,13 @@
 #-------------------------------------------------------------------------
 #
 # Makefile--
-#    Makefile for regress (the regression test)
+#    Makefile for regress/output (the regression test)
 #
 # Copyright (c) 1994, Regents of the University of California
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/test/regress/output/Attic/Makefile,v 1.9 1998/09/29 12:42:11 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/test/regress/output/Attic/Makefile,v 1.10 2000/01/09 19:34:40 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -22,8 +22,7 @@ INFILES= copy.out \
          create_function_1.out \
          create_function_2.out \
          misc.out \
-	 constraints.out \
-	 install_plpgsql.out
+	 constraints.out
 
 all: $(INFILES)
 
diff --git a/src/test/regress/output/install_plpgsql.source b/src/test/regress/output/install_plpgsql.source
deleted file mode 100644
index 78622e871b7e42c4d8535d635637fc7a8592d675..0000000000000000000000000000000000000000
--- a/src/test/regress/output/install_plpgsql.source
+++ /dev/null
@@ -1,7 +0,0 @@
-QUERY: CREATE FUNCTION plpgsql_call_handler()
-   RETURNS opaque
-   AS '_LIBDIR_/plpgsql_DLSUFFIX_'
-   LANGUAGE 'c';
-QUERY: CREATE TRUSTED PROCEDURAL LANGUAGE 'plpgsql'
-   HANDLER plpgsql_call_handler
-   LANCOMPILER 'PL/pgSQL';
diff --git a/src/test/regress/sql/Makefile b/src/test/regress/sql/Makefile
index d603f5cac11eeefc0e6ca286e64fe02123b400c6..19b4424af4565c4bb8fbbee7cf9b2ad45c62795d 100644
--- a/src/test/regress/sql/Makefile
+++ b/src/test/regress/sql/Makefile
@@ -1,17 +1,17 @@
 #-------------------------------------------------------------------------
 #
 # Makefile--
-#    Makefile for regress (the regression test)
+#    Makefile for regress/sql (the regression test)
 #
 # Copyright (c) 1994, Regents of the University of California
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/test/regress/sql/Attic/Makefile,v 1.4 1998/09/29 12:43:03 scrappy Exp $
+#    $Header: /cvsroot/pgsql/src/test/regress/sql/Attic/Makefile,v 1.5 2000/01/09 19:34:43 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
-CLFILES=	create_function_1.sql create_function_2.sql copy.sql misc.sql constraints.sql install_plpgsql.sql
+CLFILES=	create_function_1.sql create_function_2.sql copy.sql misc.sql constraints.sql
 
 clean:
 	rm -f $(CLFILES)