diff --git a/bin/jetty_wait b/bin/jetty_wait
index dc9c68d16..82c0370e0 100755
--- a/bin/jetty_wait
+++ b/bin/jetty_wait
@@ -1,10 +1,10 @@
 #!/usr/bin/env sh
 
-until $(curl --output /dev/null --silent --head --fail http://localhost:8983/solr); do
+until $(curl --output /dev/null --silent --head --fail http://localhost:8985/solr); do
     printf '.'
     sleep 1
 done
-until $(curl --output /dev/null --silent --head --fail http://localhost:8983/fedora); do
+until $(curl --output /dev/null --silent --head --fail http://localhost:8986/rest); do
     printf '.'
     sleep 1
 done
diff --git a/circle.yml b/circle.yml
index 77019f7c9..b2e214120 100644
--- a/circle.yml
+++ b/circle.yml
@@ -17,9 +17,7 @@ dependencies:
     - sudo sh bin/ci_kakadu_install.sh
     - sudo sh bin/tesseract_install.sh
     - tesseract --version
-    - RAILS_ENV=development bundle exec rake jetty:clean
-    - bundle exec rake jetty:config
-    - cd jetty && java -Djetty.port=8983 -Dsolr.solr.home=/home/ubuntu/plum/jetty/solr -XX:MaxPermSize=256m -Xmx512m -jar start.jar:
+    - bundle exec rake server:test:
         background: true
     - bin/jetty_wait
 test: