      :subprotocol "postgresql"
      :subname (format "//%s:%s/%s" (:host test-env) (:port test-env) database)
      :user (get-in test-env [:admin :name])
+     :username (get-in test-env [:admin :name])
      :password (get-in test-env [:admin :password])}))
 
 (defn routine-db-config

   :subprotocol "postgresql"
   :subname (format "//%s:%s/%s" (:host test-env) (:port test-env) database)
   :user (get-in test-env [:user :name])
   :password (get-in test-env [:user :password])
   :migrator-username (get-in test-env [:migrator :name])
   :migrator-password (get-in test-env [:migrator :password])

   :subprotocol "postgresql"
   :subname "//127.0.0.1:5432/foo"
   :user "puppetdb"
   :username "puppetdb"
   :password "xyzzy"})

(defn db-admin-config
