diff --git a/Dockerfile b/Dockerfile
index e19e6f0..fd6c3e1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -58,13 +58,9 @@ RUN chmod 0755 /usr/local/bin/aws-lambda-rie && \
 
 # Install pytest
 RUN pip install pytest --target /app
-COPY pytest.ini /app
 
 # Add our tests
 ADD tests /app/tests
 
-# Disable AWS API calls
-ENV RESOLVE_ACCOUNT="false"
-
 # Run tests
 RUN python -m pytest --capture=tee-sys tests
diff --git a/app.py b/app.py
index f7aed73..84767ba 100644
--- a/app.py
+++ b/app.py
@@ -29,7 +29,7 @@ def boolean(value):
 
 
 DEBUG = boolean(os.getenv("DEBUG", default=False))
-RESOLVE_ACCOUNT = boolean(os.getenv("RESOLVE_ACCOUNT", default=True))
+RESOLVE_ACCOUNT = boolean(os.getenv("RESOLVE_ACCOUNT", default=False))
 WEBHOOK_URL = os.environ.get("WEBHOOK_URL", "dbus://")
 
 if DEBUG: