diff --git a/regress/Makefile b/regress/Makefile
index f0425ca..943f440 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -17,26 +17,8 @@ INTVERSION := $(shell echo $$(($$(echo $(VERSION) | sed 's/\([[:digit:]]\{1,\}\)
 # Test suite
 #
 
-ifeq ($(shell echo $$(($(INTVERSION) >= 901))),1)
-REGRESS := init-extension
-else
-REGRESS := init-legacy
-endif
-
-# plpgsql not available by default on pg < 9.0
-ifeq ($(shell echo $$(($(INTVERSION) < 900))),1)
-REGRESS += plpgsql
-endif
-
-REGRESS += repack tablespace
-
-# This test depends on collate, not supported before 9.1
-ifeq ($(shell echo $$(($(INTVERSION) >= 901))),1)
-REGRESS += issue3
-endif
-
+REGRESS := init-extension repack tablespace issue3
 
 USE_PGXS = 1	# use pgxs if not in contrib directory
-PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
diff --git a/regress/expected/init-legacy.out b/regress/expected/init-legacy.out
deleted file mode 100644
index 43f11fa..0000000
--- a/regress/expected/init-legacy.out
+++ /dev/null
@@ -1,3 +0,0 @@
-SET client_min_messages = warning;
-\set ECHO none
-RESET client_min_messages;
diff --git a/regress/expected/plpgsql.out b/regress/expected/plpgsql.out
deleted file mode 100644
index bc028fb..0000000
--- a/regress/expected/plpgsql.out
+++ /dev/null
@@ -1 +0,0 @@
-CREATE LANGUAGE plpgsql;
diff --git a/regress/sql/init-legacy.sql b/regress/sql/init-legacy.sql
deleted file mode 100644
index 8b7b998..0000000
--- a/regress/sql/init-legacy.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-SET client_min_messages = warning;
-\set ECHO none
-\i ../lib/pg_repack.sql
-\set ECHO all
-RESET client_min_messages;
diff --git a/regress/sql/plpgsql.sql b/regress/sql/plpgsql.sql
deleted file mode 100644
index bc028fb..0000000
--- a/regress/sql/plpgsql.sql
+++ /dev/null
@@ -1 +0,0 @@
-CREATE LANGUAGE plpgsql;