diff --git a/.travis/run.sh b/.travis/run.sh
index 7d283b939..4f1df9ce3 100755
--- a/.travis/run.sh
+++ b/.travis/run.sh
@@ -38,6 +38,10 @@ do
 done
 set -o errexit
 
+# Once the server comes up, we add the nginx server.  This will come up
+# almost immediately, so we don't delay.
+make nginx-serve
+
 echo "*** Running the server tests"
 make test