diff --git a/src/pg/Makefile b/src/pg/Makefile
index 6dc25f1..5343989 100644
--- a/src/pg/Makefile
+++ b/src/pg/Makefile
@@ -24,7 +24,7 @@ $(DATA): $(SOURCES_DATA)
 	$(SED) $(REPLACEMENTS) $(SOURCES_DATA_DIR)/*.sql > $@
 
 TEST_DIR = test
-REGRESS = $(notdir $(basename $(wildcard $(TEST_DIR)/sql/*test.sql)))
+REGRESS = $(sort $(notdir $(basename $(wildcard $(TEST_DIR)/sql/*test.sql))))
 REGRESS_OPTS = --inputdir='$(TEST_DIR)' --outputdir='$(TEST_DIR)'
 
 PG_CONFIG = pg_config
diff --git a/src/pg/test/expected/01_install_test.out b/src/pg/test/expected/01_install_test.out
index 4851fd3..9c82e7c 100644
--- a/src/pg/test/expected/01_install_test.out
+++ b/src/pg/test/expected/01_install_test.out
@@ -1,6 +1,5 @@
 -- Install dependencies
 CREATE EXTENSION postgis;
-CREATE EXTENSION plpythonu;
-CREATE EXTENSION cartodb;
+CREATE EXTENSION postgres_fdw;
 -- Install the extension
 CREATE EXTENSION observatory VERSION 'dev';
diff --git a/src/pg/test/sql/01_install_test.sql b/src/pg/test/sql/01_install_test.sql
index f46a6e0..781b0ae 100644
--- a/src/pg/test/sql/01_install_test.sql
+++ b/src/pg/test/sql/01_install_test.sql
@@ -1,7 +1,6 @@
 -- Install dependencies
 CREATE EXTENSION postgis;
-CREATE EXTENSION plpythonu;
-CREATE EXTENSION cartodb;
+CREATE EXTENSION postgres_fdw;
 
 -- Install the extension
 CREATE EXTENSION observatory VERSION 'dev';
diff --git a/src/pg/test/sql/44_observatory_geometries_test.sql b/src/pg/test/sql/44_observatory_geometries_test.sql
index 149e9ae..6d8e9ca 100644
--- a/src/pg/test/sql/44_observatory_geometries_test.sql
+++ b/src/pg/test/sql/44_observatory_geometries_test.sql
@@ -34,7 +34,7 @@ SELECT cdb_observatory.OBS_GetBoundary(
 -- expect null geometry since there are no census tracts at null island
 -- timespan implictly null
 SELECT cdb_observatory.OBS_GetBoundary(
-  CDB_LatLng(0, 0),
+  ST_SetSRID(ST_MakePoint(0, 0), 4326),
   'us.census.tiger.census_tract'
 ) IS NULL As OBS_GetBoundary_null_island_census_tract;
 
@@ -78,7 +78,7 @@ SELECT cdb_observatory.OBS_GetBoundaryId(
 
 -- should give back null since there is not a census tract at null island
 SELECT cdb_observatory.OBS_GetBoundaryId(
-  CDB_LatLng(0, 0),
+  ST_SetSRID(ST_MakePoint(0, 0), 4326),
   'us.census.tiger.census_tract'
 ) IS NULL As OBS_GetBoundaryId_null_island;