diff --git a/completions/psql b/completions/psql
index c462bf01..a43cdaf6 100644
--- a/completions/psql
+++ b/completions/psql
@@ -51,7 +51,7 @@ _createdb()
         _pg_databases
     fi
 } &&
-complete -F _createdb -o default createdb
+complete -F _createdb createdb
 
 # dropdb(1) completion
 #
@@ -84,7 +84,7 @@ _dropdb()
         _pg_databases
     fi
 } &&
-complete -F _dropdb -o default dropdb
+complete -F _dropdb dropdb
 
 # psql(1) completion
 #
diff --git a/test/lib/completions/createdb.exp b/test/lib/completions/createdb.exp
index aafff1b6..234817f9 100644
--- a/test/lib/completions/createdb.exp
+++ b/test/lib/completions/createdb.exp
@@ -11,9 +11,7 @@ proc teardown {} {
 setup
 
 
-assert_complete_any "createdb "
-
-
+assert_complete_any "createdb -"
 sync_after_int
 
 
diff --git a/test/lib/completions/dropdb.exp b/test/lib/completions/dropdb.exp
index 8f2d5bfb..d68cd48a 100644
--- a/test/lib/completions/dropdb.exp
+++ b/test/lib/completions/dropdb.exp
@@ -11,9 +11,7 @@ proc teardown {} {
 setup
 
 
-assert_complete_any "dropdb "
-
-
+assert_complete_any "dropdb -"
 sync_after_int