diff --git a/bin/runtests.sh b/bin/runtests.sh
index 5c2868d2b61907ded36c1e964b6286a3e5253a39..e9bf77a5d7dbeb89ae2f9db2eb7a70581c3b56f0 100755
--- a/bin/runtests.sh
+++ b/bin/runtests.sh
@@ -70,7 +70,7 @@ case "$1-$2" in
       -f test/docker-compose.yml \
       run \
       --rm \
-      --entrypoint "abao /usr/src/raml/api.raml --server=http://scitran-core:8080/api --hookfiles=/usr/src/tests/abao/abao_test_hooks.js" \
+      --entrypoint "/bin/bash -c 'cd /usr/src/raml/schemas/definitions && abao /usr/src/raml/api.raml --server=http://scitran-core:8080/api --hookfiles=/usr/src/tests/abao/abao_test_hooks.js'" \
       integration-test &&
     docker-compose \
       -f test/docker-compose.yml \
diff --git a/raml/schemas/output/config.json b/raml/schemas/output/config.json
index 20270561efb8c6a15e2a87eaf81f732e7c947fc3..c616fc216df5fde10d5cb1ff17c2685b83e7eee0 100644
--- a/raml/schemas/output/config.json
+++ b/raml/schemas/output/config.json
@@ -9,7 +9,7 @@
           "type": "string"
         },
         "ssl_cert": {
-          "type": "null"
+          "type": ["null", "string"]
         },
         "api_url": {
           "type": "string"
diff --git a/test/Dockerfile b/test/Dockerfile
index 5e9b5a7d09d608aa07262e773b0972ee8c4c14cd..19f8aeef78ba45b578c2e022039413a20dd9b2da 100644
--- a/test/Dockerfile
+++ b/test/Dockerfile
@@ -20,7 +20,7 @@ RUN apt-get update && apt-get -y install nodejs
 
 # Install abao: https://github.com/cybertk/abao
 # Using our fork of abao to expand jsonschema refs
-RUN npm install -g git+https://github.com/flywheel-io/abao.git#add-jsonschema-deref
+RUN npm install -g git+https://github.com/flywheel-io/abao.git#better-jsonschema-ref
 
 # Install newman for running postman collection tests from CLI
 RUN npm install -g newman