diff --git a/geocoder/extension/Makefile b/geocoder/extension/Makefile
index f5ec3b8..f93f488 100644
--- a/geocoder/extension/Makefile
+++ b/geocoder/extension/Makefile
@@ -4,13 +4,8 @@ EXTENSION = cdb_geocoder
 EXTVERSION = $(shell grep default_version $(EXTENSION).control | sed -e "s/default_version[[:space:]]*=[[:space:]]*'\([^']*\)'/\1/")
 
 DATA = $(EXTENSION)--$(EXTVERSION).sql
-REGRESS = \
-  00_install_test \
-  cdb_geocoder_admin0_test \
-  cdb_geocoder_admin1_test \
-  cdb_geocoder_ipaddr_test \
-  cdb_geocoder_namedplaces_test \
-  cdb_geocoder_postalcode_test
+
+REGRESS = $(notdir $(basename $(wildcard sql/*test.sql)))
 
 # postgres build stuff
 PG_CONFIG = pg_config
diff --git a/geocoder/extension/expected/cdb_geocoder_admin0_test.out b/geocoder/extension/expected/10_admin0_test.out
similarity index 100%
rename from geocoder/extension/expected/cdb_geocoder_admin0_test.out
rename to geocoder/extension/expected/10_admin0_test.out
diff --git a/geocoder/extension/expected/cdb_geocoder_admin1_test.out b/geocoder/extension/expected/20_admin1_test.out
similarity index 100%
rename from geocoder/extension/expected/cdb_geocoder_admin1_test.out
rename to geocoder/extension/expected/20_admin1_test.out
diff --git a/geocoder/extension/expected/cdb_geocoder_ipaddr_test.out b/geocoder/extension/expected/30_ipaddr_test.out
similarity index 100%
rename from geocoder/extension/expected/cdb_geocoder_ipaddr_test.out
rename to geocoder/extension/expected/30_ipaddr_test.out
diff --git a/geocoder/extension/expected/cdb_geocoder_namedplaces_test.out b/geocoder/extension/expected/40_namedplaces_test.out
similarity index 100%
rename from geocoder/extension/expected/cdb_geocoder_namedplaces_test.out
rename to geocoder/extension/expected/40_namedplaces_test.out
diff --git a/geocoder/extension/expected/cdb_geocoder_postalcode_test.out b/geocoder/extension/expected/50_postalcode_test.out
similarity index 100%
rename from geocoder/extension/expected/cdb_geocoder_postalcode_test.out
rename to geocoder/extension/expected/50_postalcode_test.out
diff --git a/geocoder/extension/sql/cdb_geocoder_admin0_test.sql b/geocoder/extension/sql/10_admin0_test.sql
similarity index 100%
rename from geocoder/extension/sql/cdb_geocoder_admin0_test.sql
rename to geocoder/extension/sql/10_admin0_test.sql
diff --git a/geocoder/extension/sql/cdb_geocoder_admin1_test.sql b/geocoder/extension/sql/20_admin1_test.sql
similarity index 100%
rename from geocoder/extension/sql/cdb_geocoder_admin1_test.sql
rename to geocoder/extension/sql/20_admin1_test.sql
diff --git a/geocoder/extension/sql/cdb_geocoder_ipaddr_test.sql b/geocoder/extension/sql/30_ipaddr_test.sql
similarity index 100%
rename from geocoder/extension/sql/cdb_geocoder_ipaddr_test.sql
rename to geocoder/extension/sql/30_ipaddr_test.sql
diff --git a/geocoder/extension/sql/cdb_geocoder_namedplaces_test.sql b/geocoder/extension/sql/40_namedplaces_test.sql
similarity index 100%
rename from geocoder/extension/sql/cdb_geocoder_namedplaces_test.sql
rename to geocoder/extension/sql/40_namedplaces_test.sql
diff --git a/geocoder/extension/sql/cdb_geocoder_postalcode_test.sql b/geocoder/extension/sql/50_postalcode_test.sql
similarity index 100%
rename from geocoder/extension/sql/cdb_geocoder_postalcode_test.sql
rename to geocoder/extension/sql/50_postalcode_test.sql