diff --git a/awx/conf/tests/unit/test_settings.py b/awx/conf/tests/unit/test_settings.py
index 2f3c197478..d290228056 100644
--- a/awx/conf/tests/unit/test_settings.py
+++ b/awx/conf/tests/unit/test_settings.py
@@ -264,7 +264,7 @@ def test_setting_from_db_with_unicode(settings, mocker, encrypted):
     # this simulates a bug in python-memcached; see https://github.com/linsomniac/python-memcached/issues/79
     value = six.u('Iñtërnâtiônàlizætiøn').encode('utf-8')
 
-    setting_from_db = mocker.Mock(key='AWX_SOME_SETTING', value=value)
+    setting_from_db = mocker.Mock(id=1, key='AWX_SOME_SETTING', value=value)
     mocks = mocker.Mock(**{
         'order_by.return_value': mocker.Mock(**{
             '__iter__': lambda self: iter([setting_from_db]),
diff --git a/setup.cfg b/setup.cfg
index 1ffaacf118..333b8df62f 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -18,4 +18,4 @@ exclude=.tox,venv,awx/lib/site-packages,awx/plugins/inventory/ec2.py,awx/plugins
 
 [flake8]
 ignore=E201,E203,E221,E225,E231,E241,E251,E261,E265,E303,E501,W291,W391,W293,E731,F405
-exclude=.tox,venv,awx/lib/site-packages,awx/plugins/inventory,awx/ui,awx/api/urls.py,awx/main/migrations,awx/main/south_migrations,awx/main/tests/data,node_modules/,awx/projects/,tools/docker,awx/settings/local_*.py,installer/openshift/settings.py,build/
+exclude=.tox,venv,awx/lib/site-packages,awx/plugins/inventory,awx/ui,awx/api/urls.py,awx/main/migrations,awx/main/south_migrations,awx/main/tests/data,node_modules/,awx/projects/,tools/docker,awx/settings/local_*.py,installer/openshift/settings.py,build/,installer/
diff --git a/tools/docker-compose/unit-tests/Dockerfile b/tools/docker-compose/unit-tests/Dockerfile
index 15d8d25c22..9398c89398 100644
--- a/tools/docker-compose/unit-tests/Dockerfile
+++ b/tools/docker-compose/unit-tests/Dockerfile
@@ -1,5 +1,4 @@
-ARG TAG=latest
-FROM gcr.io/ansible-tower-engineering/awx_devel:$TAG
+FROM gcr.io/ansible-tower-engineering/awx_devel:latest
 
 # For UI tests
 RUN yum install -y bzip2 gcc-c++