diff --git a/contrib/unaccent/Makefile b/contrib/unaccent/Makefile
index f0be62db53f..4ee2c685c85 100644
--- a/contrib/unaccent/Makefile
+++ b/contrib/unaccent/Makefile
@@ -9,9 +9,8 @@ DATA_TSEARCH = unaccent.rules
 
 REGRESS = unaccent
 
-# We need a UTF8 database
-ENCODING = UTF8
-NO_LOCALE = 1
+# Adjust REGRESS_OPTS because we need a UTF8 database
+REGRESS_OPTS = --dbname=$(CONTRIB_TESTDB) --encoding=UTF8 --no-locale
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config