diff --git a/.env b/.env
index c88f62c9..33eb2c83 100644
--- a/.env
+++ b/.env
@@ -15,6 +15,7 @@ AZURITE_KEY=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZF
 AZURITE_HOST=azurite:10000
 AZURITE_SECURE=False
 
+PGWEB_PORT=8882
 POSTGRES_PORT=8881
 POSTGRES_USER=ascoderu
 POSTGRES_PASSWORD=secretpassword
diff --git a/.travis.yml b/.travis.yml
index f7e2ff25..b1717a30 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,12 @@ env:
 services:
   - docker
 
+before_install:
+  - |
+    sudo curl -fsSL "https://github.com/docker/compose/releases/download/1.24.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+    sudo chmod +x /usr/local/bin/docker-compose
+    docker-compose version
+
 script:
   - |
     if [[ "$TRAVIS_EVENT_TYPE" = "cron" ]]; then
diff --git a/docker-compose.yml b/docker-compose.yml
index b7d0070c..5a7ae372 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -98,10 +98,10 @@ services:
     command: /app/setup.sh --help
 
   rabbitmq:
-    image: rabbitmq:3.7.8-management
+    image: rabbitmq:management-alpine
 
   appinsights:
-    image: cwolff/appinsights-on-premises:0.0.14-postgres
+    image: cwolff/appinsights-on-premises:0.1.2-postgres
     depends_on:
       - postgres
     environment:
@@ -125,3 +125,11 @@ services:
       executable: blob
     ports:
       - ${AZURITE_PORT}:10000
+
+  pgweb:
+    image: sosedoff/pgweb:latest
+    depends_on:
+      - postgres
+    command: ["/usr/bin/pgweb", "--bind=0.0.0.0", "--listen=8000", "--url=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB}?sslmode=disable"]
+    ports:
+      - ${PGWEB_PORT}:8000
diff --git a/makefile b/makefile
index fc52b290..81f55110 100644
--- a/makefile
+++ b/makefile
@@ -66,7 +66,7 @@ clean:
 
 build:
 	docker-compose pull --ignore-pull-failures
-	docker-compose build
+	docker-compose build --parallel
 
 start:
 	docker-compose up -d
diff --git a/tests/integration/assert.sh b/tests/integration/assert.sh
index 9ffb8f27..a1e92f45 100755
--- a/tests/integration/assert.sh
+++ b/tests/integration/assert.sh
@@ -16,11 +16,3 @@ if [[ "${num_exceptions}" -ne "${num_exceptions_expected}" ]]; then
   echo "Got ${num_exceptions} exceptions but expected ${num_exceptions_expected}" >&2
   exit 2
 fi
-
-num_error_requests="$(sql_query 'select count(*) from requests where status_code != 200;')"
-num_error_requests_expected=1
-
-if [[ "${num_error_requests}" -ne "${num_error_requests_expected}" ]]; then
-  echo "Got ${num_error_requests} error requests but expected ${num_error_requests_expected}" >&2
-  exit 3
-fi