diff --git a/.travis.yml b/.travis.yml
index 75653d4e9..c4bef391b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ language: python
 
 services:
   - rabbitmq
+  - mysql
 
 # http://docs.travis-ci.com/user/ci-environment/#CI-environment-OS
 before_install:
@@ -25,6 +26,7 @@ env:
 addons:
   hosts:
     - le.wtf
+  mariadb: "10.0"
 
 install: "travis_retry pip install tox coveralls"
 before_script: '[ "xxx$BOULDER_INTEGRATION" = "xxx" ] || ./tests/boulder-start.sh'
diff --git a/letsencrypt/plugins/manual_test.py b/letsencrypt/plugins/manual_test.py
index 24d4a7ecc..caf7fb3c4 100644
--- a/letsencrypt/plugins/manual_test.py
+++ b/letsencrypt/plugins/manual_test.py
@@ -51,7 +51,7 @@ class ManualAuthenticatorTest(unittest.TestCase):
     @mock.patch("__builtin__.raw_input")
     def test_perform(self, mock_raw_input, mock_verify, mock_urandom,
                      mock_stdout):
-        mock_urandom.return_value = "foo"
+        mock_urandom.side_effect = nonrandom_urandom
         mock_verify.return_value = True
 
         resp = challenges.SimpleHTTPResponse(tls=False)
@@ -106,5 +106,10 @@ class ManualAuthenticatorTest(unittest.TestCase):
         mock_killpg.assert_called_once_with(1234, signal.SIGTERM)
 
 
+def nonrandom_urandom(num_bytes):
+    """Returns a string of length num_bytes"""
+    return "x" * num_bytes
+
+
 if __name__ == "__main__":
     unittest.main()  # pragma: no cover
diff --git a/tests/boulder-start.sh b/tests/boulder-start.sh
index 8cb7fefce..2ab97f53d 100755
--- a/tests/boulder-start.sh
+++ b/tests/boulder-start.sh
@@ -5,5 +5,6 @@ export GOPATH="${GOPATH:-/tmp/go}"
 
 go get -d github.com/letsencrypt/boulder
 cd $GOPATH/src/github.com/letsencrypt/boulder
+./test/create_db.sh
 ./start.py &
 # Hopefully start.py bootstraps before integration test is started...