diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7c67664..7d86f55 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -111,7 +111,7 @@ jobs:
             git config user.email "fx-data-platform@mozilla.com"
             git config user.name "CircleCI docs-deploy job"
             npm install -g --silent gh-pages@2.0.1
-            gh-pages -d docs/_build/html
+            gh-pages --dotfiles --message "[skip ci] Updates" --dist docs/_build/html
 
   lint:
     docker:
diff --git a/tox.ini b/tox.ini
index 2138972..9a591c8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -20,12 +20,9 @@ skipsdist = True
 usedevelop = True
 extras = testing
 commands = pytest {posargs:tests/}
-
-# 2018-09-14: moto isn't working with latest boto3, so we need to pin version for tests;
-# see https://github.com/spulec/moto/pull/1801
-# TODO: Remove this once moto restores compatibility
-deps =
-    boto3==1.7.84
+setenv =
+    AWS_SECRET_ACCESS_KEY=dummy_secret_needed_for_moto_tests
+    AWS_ACCESS_KEY_ID=dummy_key_needed_for_moto_tests
 
 [testenv:lint]
 deps =