diff --git a/.travis.yml b/.travis.yml
index e5ef07f464a1ade71ba3bc69137e97b519add62e..7983595abb83961fe7e6694b753357d9cd9c929c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,20 @@
 language: node_js
- 
+
 before_install:
  - sudo apt-get install libgmp3-dev
+ - "mysql -e 'create database browserid;'"
 
 node_js:
  - 0.6
 
 notifications:
   irc: "irc.mozilla.org#identity"
+
+env:
+ - MYSQL_USER=root
+
+mysql:
+  adapter: mysql2
+  username: root
+  encoding: utf8
+  database: browserid
diff --git a/lib/configuration.js b/lib/configuration.js
index 78eead9e9a37dfb31eff37c96b9fdc452f775e46..f256a334c879d2039c551962cae84fdbae0efada 100644
--- a/lib/configuration.js
+++ b/lib/configuration.js
@@ -76,7 +76,10 @@ var conf = module.exports = convict({
   },
   database: {
     driver: 'string ["json", "mysql"] = "json"',
-    user: 'string?',
+    user: {
+      format: 'string?',
+      env: 'MYSQL_USER'
+    },
     create_schema: 'boolean = true',
     may_write: 'boolean = true',
     name: {
diff --git a/tests/verifier-test.js b/tests/verifier-test.js
index cdafb345bd39d7b56a236bc88490599fb44330fe..b2a455dc04807502630199c49333d5a9a42e7572 100755
--- a/tests/verifier-test.js
+++ b/tests/verifier-test.js
@@ -721,7 +721,7 @@ function make_other_issuer_tests(new_style) {
       var fakeDomainKeypair = jwk.KeyPair.generate("RS", 64);
       var newClientKeypair = jwk.KeyPair.generate("DS", 256);
       expiration = new Date(new Date().getTime() + (1000 * 60 * 60 * 6));
-      var cert = new jwcert.JWCert("lloyd.io", expiration, new Date(), newClientKeypair.publicKey,
+      var cert = new jwcert.JWCert("no.such.domain", expiration, new Date(), newClientKeypair.publicKey,
                                    {email: TEST_EMAIL}).sign(fakeDomainKeypair.secretKey);
 
       var expirationDate = new Date(new Date().getTime() + (2 * 60 * 1000));
@@ -744,7 +744,7 @@ function make_other_issuer_tests(new_style) {
       "to return a clear error message": function (err, r) {
         var resp = JSON.parse(r.body);
         assert.strictEqual(resp.status, 'failure');
-        assert.strictEqual(resp.reason, "can't get public key for lloyd.io");
+        assert.strictEqual(resp.reason, "can't get public key for no.such.domain");
       }
     }
   };