diff --git a/circle.yml b/circle.yml
index a04284a..da1d72a 100644
--- a/circle.yml
+++ b/circle.yml
@@ -13,7 +13,8 @@ dependencies:
     - nvm use 8.1.4 && npm install -g npm
 
     # Install CouchDB 2
-    - docker run -d --name couchdb --restart always -p 5984:5984 -e COUCHDB_USER='admin' -e COUCHDB_PASSWORD='admin' redgeoff/couchdb
+    # - docker run -d --name couchdb --restart always -p 5984:5984 -e COUCHDB_USER='admin' -e COUCHDB_PASSWORD='admin' redgeoff/couchdb
+    - docker run -d --name couchdb -p 5984:5984 -e COUCHDB_USER='admin' -e COUCHDB_PASSWORD='admin' redgeoff/couchdb
     # Wait for DB to be ready
     - sleep 15
     # Create system DBs
@@ -51,3 +52,7 @@ test:
     # couchdb 1.6.1 docker image. We'll probably need to build a custom image for these tests.
     # Test on CouchDB 1
     # - nvm use 8.1.4 && COUCHDB_PORT=15984 npm run node-full-test
+
+  post:
+    # Stop CouchDB instance to prevent bind conflicts with subsequent test containers
+    - docker stop couchdb