diff --git a/.github/workflows/acceptance-test.yml b/.github/workflows/acceptance-test.yml
index 1c2b6bcddc..2c4c4e44d1 100644
--- a/.github/workflows/acceptance-test.yml
+++ b/.github/workflows/acceptance-test.yml
@@ -6,7 +6,7 @@ on:
 jobs:
   test:
     if: github.event.label.name == 'AMAUAT'
-    name: "Test ${{ matrix.tag }} ${{ matrix.python_version }} on ${{ matrix.browser }}"
+    name: "Test ${{ matrix.tag }} on ${{ matrix.browser }}"
     runs-on: "ubuntu-18.04"
     strategy:
       matrix:
@@ -24,9 +24,6 @@ jobs:
         browser:
           - "Firefox"
           - "Chrome"
-        python_version:
-          - "python2"
-          - "python3"
         exclude:
           - tag: "black-box"
             browser: Firefox
@@ -49,14 +46,11 @@ jobs:
       - name: "Build images"
         run: |
           make -C hack/ build
-        env:
-          PYTHON_VERSION: ${{ matrix.python_version }}
       - name: "Start services"
         run: |
           docker-compose up -d
         env:
           cluster.routing.allocation.disk.threshold_enabled: false
-          PYTHON_VERSION: ${{ matrix.python_version }}
         working-directory: ./hack
       - name: "Bootstrap services"
         run: |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 75b59a90c0..8cc4923e92 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,39 +14,21 @@ jobs:
       matrix:
         include:
           - rule: mcp-server
-            coverage: true
-            python_version: py27
-          - rule: mcp-server-py36
             coverage: true
             python_version: py36
           - rule: mcp-client
-            coverage: true
-            python_version: py27
-          - rule: mcp-client-py36
             coverage: true
             python_version: py36
           - rule: dashboard
-            coverage: true
-            python_version: py27
-          - rule: dashboard-py36
             coverage: true
             python_version: py36
           - rule: archivematica-common
-            coverage: true
-            python_version: py27
-          - rule: archivematica-common-py36
             coverage: true
             python_version: py36
           - rule: storage-service
-            coverage: false
-            python_version: py27
-          - rule: storage-service-py36
             coverage: false
             python_version: py36
           - rule: migrations
-            coverage: false
-            python_version: py27
-          - rule: migrations-py36
             coverage: false
             python_version: py36
     steps:
diff --git a/Makefile b/Makefile
index f4357b5fa9..a06623c6ed 100644
--- a/Makefile
+++ b/Makefile
@@ -3,21 +3,11 @@ pip-compile:  # Compile pip requirements
 	pip-compile --allow-unsafe --output-file requirements.txt requirements.in
 	pip-compile --allow-unsafe --output-file requirements-dev.txt requirements-dev.in
 
-.PHONY: pip-compile-py3
-pip-compile-py3:  # Compile pip requirements (Python 3)
-	pip-compile --allow-unsafe --output-file requirements-py3.txt requirements.in
-	pip-compile --allow-unsafe --output-file requirements-dev-py3.txt requirements-dev-py3.in
-
 .PHONY: pip-upgrade
 pip-upgrade:  # Upgrade pip requirements
 	pip-compile --allow-unsafe --upgrade --output-file requirements.txt requirements.in
 	pip-compile --allow-unsafe --upgrade --output-file requirements-dev.txt requirements-dev.in
 
-.PHONY: pip-upgrade-py3
-pip-upgrade-py3:  # Upgrade pip requirements
-	pip-compile --allow-unsafe --upgrade --output-file requirements-py3.txt requirements.in
-	pip-compile --allow-unsafe --upgrade --output-file requirements-dev-py3.txt requirements-dev-py3.in
-
 .PHONY: pip-sync
 pip-sync:  # Sync virtualenv
 	pip-sync requirements.txt
diff --git a/hack/Dockerfile b/hack/Dockerfile
index a7d0e4c3b9..28ded9f89b 100644
--- a/hack/Dockerfile
+++ b/hack/Dockerfile
@@ -1,5 +1,4 @@
 ARG TARGET=archivematica-mcp-server
-ARG PYTHON_VERSION=python3
 
 FROM ubuntu:18.04 AS base
 
@@ -37,15 +36,17 @@ RUN set -ex \
 	&& add-apt-repository --no-update --yes "deb http://archive.ubuntu.com/ubuntu/ bionic-updates multiverse" \
 	&& apt-get update \
 	&& apt-get install -y --no-install-recommends \
-		build-essential libyaml-dev clamav \
+		build-essential python3-dev libyaml-dev clamav \
 	&& /src/hack/osdeps.py Ubuntu-18 1 | grep -v -E "nginx|postfix" | xargs apt-get install -y --no-install-recommends \
 	&& rm -rf /var/lib/apt/lists/*
 
 # Download ClamAV virus signatures
 RUN freshclam --quiet
 
-# Install Node.js and Yarn
+# Install pip, Node.js and Yarn
 RUN set -ex \
+	&& curl -s https://bootstrap.pypa.io/get-pip.py | python3.6 \
+	&& update-alternatives --install /usr/bin/python python /usr/bin/python3 10 \
 	&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
 	&& add-apt-repository --yes "deb https://dl.yarnpkg.com/debian/ stable main" \
 	&& apt-get install -y --no-install-recommends \
@@ -60,46 +61,14 @@ RUN set -ex \
 	&& mkdir -p /var/archivematica/sharedDirectory \
 	&& chown -R archivematica:archivematica /var/archivematica
 
-# -----------------------------------------------------------------------------
-
-FROM base AS python2
-
-RUN set -ex \
-	&& apt-get update \
-	&& apt-get install -y --no-install-recommends \
-		python-dev \
-	&& rm -rf /var/lib/apt/lists/*
-
-RUN set -ex \
-	&& curl -s https://bootstrap.pypa.io/pip/2.7/get-pip.py | python2.7
-
 COPY requirements-dev.txt /src/requirements-dev.txt
-RUN pip2 install -r /src/requirements-dev.txt
+RUN pip3 install -r /src/requirements-dev.txt
 
 COPY . /src
 
 # -----------------------------------------------------------------------------
 
-FROM base AS python3
-
-RUN set -ex \
-	&& apt-get update \
-	&& apt-get install -y --no-install-recommends \
-		python3-dev \
-	&& rm -rf /var/lib/apt/lists/*
-
-RUN set -ex \
-	&& curl -s https://bootstrap.pypa.io/get-pip.py | python3.6 \
-	&& update-alternatives --install /usr/bin/python python /usr/bin/python3 10
-
-COPY requirements-dev-py3.txt /src/requirements-dev-py3.txt
-RUN pip3 install -r /src/requirements-dev-py3.txt
-
-COPY . /src
-
-# -----------------------------------------------------------------------------
-
-FROM ${PYTHON_VERSION} AS archivematica-mcp-client
+FROM base AS archivematica-mcp-client
 
 # Some scripts in archivematica-fpr-admin executed by MCPClient rely on certain
 # files being available in this image (e.g. see https://git.io/vA1wF).
@@ -118,7 +87,7 @@ ENTRYPOINT ["/src/src/MCPClient/lib/archivematicaClient.py"]
 
 # -----------------------------------------------------------------------------
 
-FROM ${PYTHON_VERSION} AS archivematica-mcp-server
+FROM base AS archivematica-mcp-server
 
 USER archivematica
 
@@ -129,7 +98,7 @@ ENTRYPOINT ["/src/src/MCPServer/lib/archivematicaMCP.py"]
 
 # -----------------------------------------------------------------------------
 
-FROM ${PYTHON_VERSION} AS archivematica-dashboard
+FROM base AS archivematica-dashboard
 
 RUN set -ex \
 	&& internalDirs=' \
@@ -197,24 +166,6 @@ ENTRYPOINT ["yarn", "run", "test-single-run"]
 
 FROM base AS archivematica-tests
 
-RUN set -ex \
-	&& apt-get update \
-	&& apt-get install -y --no-install-recommends \
-		python-dev python3-dev \
-	&& rm -rf /var/lib/apt/lists/*
-
-RUN set -ex \
-	&& curl -s https://bootstrap.pypa.io/pip/2.7/get-pip.py | python2.7 \
-	&& curl -s https://bootstrap.pypa.io/get-pip.py | python3.6
-
-COPY requirements-dev.txt /src/requirements-dev.txt
-RUN pip2 install -r /src/requirements-dev.txt
-
-COPY requirements-dev-py3.txt /src/requirements-dev-py3.txt
-RUN pip3 install -r /src/requirements-dev-py3.txt
-
-COPY . /src
-
 # -----------------------------------------------------------------------------
 
 FROM ${TARGET}
diff --git a/hack/Makefile b/hack/Makefile
index beed45eeb0..44dfd862bb 100644
--- a/hack/Makefile
+++ b/hack/Makefile
@@ -223,55 +223,35 @@ test-build:  ## Build archivematica-tests image.
 		--build-arg TARGET=archivematica-tests \
 			../
 
-__TOXENVS_MCPSERVER := py27-mcpserver
+__TOXENVS_MCPSERVER := py36-mcpserver
 test-mcp-server: start-mysql  ## Run MCPServer tests.
 	$(call run_toxenvs,$(__TOXENVS_MCPSERVER))
 
-test-mcp-server-py36: start-mysql  ## Run MCPServer tests in Python 3.6.
-	$(call run_toxenvs,py36-mcpserver)
-
-__TOXENVS_MCPCLIENT = py27-mcpclient py27-mcpclient-ensure-no-mutable-globals
+__TOXENVS_MCPCLIENT = py36-mcpclient py36-mcpclient-ensure-no-mutable-globals
 test-mcp-client: start-mysql  ## Run MCPClient tests.
 	$(call run_toxenvs,$(__TOXENVS_MCPCLIENT))
 
-test-mcp-client-py36: start-mysql  ## Run MCPClient tests in Python 3.6.
-	$(call run_toxenvs,py36-mcpclient py36-mcpclient-ensure-no-mutable-globals)
-
-__TOXENVS_DASHBOARD = py27-dashboard
+__TOXENVS_DASHBOARD = py36-dashboard
 test-dashboard: start-mysql  ## Run Dashboard tests.
 	$(call run_toxenvs,$(__TOXENVS_DASHBOARD))
 
-test-dashboard-py36: start-mysql  ## Run Dashboard tests in Python 3.6.
-	$(call run_toxenvs,py36-dashboard)
-
-__TOXENVS_STORAGE_SERVICE = py27-storage-service
+__TOXENVS_STORAGE_SERVICE = py36-storage-service
 test-storage-service: start-mysql  ## Run Storage Service tests.
 	$(call run_toxenvs,$(__TOXENVS_STORAGE_SERVICE))
 
-test-storage-service-py36: start-mysql  ## Run Storage Service tests in Python 3.6.
-	$(call run_toxenvs,py36-storage-service)
-
 test-storage-service-integration:  ## Run Storage Service unit and integration tests using MySQL and MinIO.
 	$(CURDIR)/submodules/archivematica-storage-service/integration/run.sh
 
-__TOXENVS_ARCHIVEMATICA_COMMON = py27-archivematica-common
+__TOXENVS_ARCHIVEMATICA_COMMON = py36-archivematica-common
 test-archivematica-common: start-mysql  ## Run Archivematica Common tests.
 	$(call run_toxenvs,$(__TOXENVS_ARCHIVEMATICA_COMMON))
 
-test-archivematica-common-py36: start-mysql  ## Run Archivematica Common tests in Python 3.6.
-	$(call run_toxenvs,py36-archivematica-common)
-
-__TOXENVS_MIGRATIONS = py27-migrations-dashboard migrations-storage-service
+__TOXENVS_MIGRATIONS = py36-migrations-dashboard migrations-storage-service
 test-migrations: start-mysql  ## Check there are no pending migrations.
 	$(call create_db,DASHBOARDTEST)
 	$(call create_db,SSTEST)
 	$(call run_toxenvs,$(__TOXENVS_MIGRATIONS))
 
-test-migrations-py36: start-mysql  ## Check there are no pending migrations in Python 3.6.
-	$(call create_db,DASHBOARDTEST)
-	$(call create_db,SSTEST)
-	$(call run_toxenvs,py36-migrations-dashboard)
-
 __TOXENVS_LINTING = linting
 test-linting:  ## Check linting.
 	$(call run_toxenvs,$(__TOXENVS_LINTING))
diff --git a/hack/docker-compose.tests.yml b/hack/docker-compose.tests.yml
index eedc0b32fb..c45bbcf835 100644
--- a/hack/docker-compose.tests.yml
+++ b/hack/docker-compose.tests.yml
@@ -9,7 +9,6 @@ services:
       dockerfile: "hack/Dockerfile"
       args:
         TARGET: "archivematica-tests"
-        PYTHON_VERSION: ${PYTHON_VERSION:-python3}
     volumes:
       - "../:/src"
     links:
diff --git a/hack/docker-compose.yml b/hack/docker-compose.yml
index 2fbe56b116..1ba835d17a 100644
--- a/hack/docker-compose.yml
+++ b/hack/docker-compose.yml
@@ -97,7 +97,6 @@ services:
       dockerfile: "hack/Dockerfile"
       args:
         TARGET: "archivematica-mcp-server"
-        PYTHON_VERSION: ${PYTHON_VERSION:-python3}
     environment:
       DJANGO_SECRET_KEY: "12345"
       DJANGO_SETTINGS_MODULE: "settings.common"
@@ -122,7 +121,6 @@ services:
       dockerfile: "hack/Dockerfile"
       args:
         TARGET: "archivematica-mcp-client"
-        PYTHON_VERSION: ${PYTHON_VERSION:-python3}
     environment:
       DJANGO_SECRET_KEY: "12345"
       DJANGO_SETTINGS_MODULE: "settings.common"
@@ -160,7 +158,6 @@ services:
       dockerfile: "hack/Dockerfile"
       args:
         TARGET: "archivematica-dashboard"
-        PYTHON_VERSION: ${PYTHON_VERSION:-python3}
     environment:
       FORWARDED_ALLOW_IPS: "*"
       AM_GUNICORN_ACCESSLOG: "/dev/null"
@@ -189,7 +186,6 @@ services:
       context: "submodules/archivematica-storage-service"
       args:
         TARGET: "archivematica-storage-service"
-        PYTHON_VERSION: ${PYTHON_VERSION:-python3}
     environment:
       FORWARDED_ALLOW_IPS: "*"
       SS_GUNICORN_ACCESSLOG: "/dev/null"
diff --git a/hack/submodules/archivematica-storage-service b/hack/submodules/archivematica-storage-service
index e30f9db92f..85f77d1839 160000
--- a/hack/submodules/archivematica-storage-service
+++ b/hack/submodules/archivematica-storage-service
@@ -1 +1 @@
-Subproject commit e30f9db92f4d870c21e8515480776c38c3d46e5d
+Subproject commit 85f77d18391cdd89b228b6b90e38ab91e41b170c
diff --git a/requirements-dev-py3.in b/requirements-dev-py3.in
deleted file mode 100644
index b2335f6a1a..0000000000
--- a/requirements-dev-py3.in
+++ /dev/null
@@ -1,13 +0,0 @@
--r requirements-py3.txt
-
-coverage==4.2
-mock
-git+https://github.com/artefactual-labs/mockldap@v0.3.1#egg=mockldap
-pytest>=4,<5
-pytest-cov==2.4.0
-pytest-django>=3,<4
-pytest-mock>=1,<2
-pytest-pythonpath
-pytest-randomly==1.2.3
-tox
-vcrpy>=1,<2
diff --git a/requirements-dev-py3.txt b/requirements-dev-py3.txt
deleted file mode 100644
index 7ebed428a2..0000000000
--- a/requirements-dev-py3.txt
+++ /dev/null
@@ -1,102 +0,0 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    pip-compile --allow-unsafe --output-file=requirements-dev-py3.txt requirements-dev-py3.in
-#
-agentarchives==0.7.0      # via -r requirements-py3.txt
-amclient==1.1.1           # via -r requirements-py3.txt
-ammcpc==0.1.3             # via -r requirements-py3.txt
-appdirs==1.4.4            # via virtualenv
-atomicwrites==1.4.0       # via pytest
-attrs==21.2.0             # via pytest
-bagit==1.7.0              # via -r requirements-py3.txt
-brotli==0.5.2             # via -r requirements-py3.txt
-certifi==2021.5.30        # via -r requirements-py3.txt, requests
-cffi==1.14.5              # via -r requirements-py3.txt, cryptography
-chardet==4.0.0            # via -r requirements-py3.txt, requests
-clamd==1.0.2              # via -r requirements-py3.txt
-click==8.0.1              # via -r requirements-py3.txt, pip-tools
-coverage==4.2             # via -r requirements-dev-py3.in, pytest-cov
-cryptography==3.4.7       # via -r requirements-py3.txt, josepy, mozilla-django-oidc, pyopenssl
-distlib==0.3.2            # via virtualenv
-django-auth-ldap==1.3.0   # via -r requirements-py3.txt
-django-autoslug==1.9.3    # via -r requirements-py3.txt
-django-braces==1.0.0      # via -r requirements-py3.txt
-django-cas-ng==3.6.0      # via -r requirements-py3.txt
-django-csp==3.7.0         # via -r requirements-py3.txt
-django-extensions==1.7.9  # via -r requirements-py3.txt
-django-forms-bootstrap==3.1.0  # via -r requirements-py3.txt
-django-prometheus==1.0.15  # via -r requirements-py3.txt
-git+https://github.com/Brown-University-Library/django-shibboleth-remoteuser.git@67d270c65c201606fb86d548493d4b3fd8cc7a76#egg=django-shibboleth-remoteuser  # via -r requirements-py3.txt
-django-tastypie==0.13.2   # via -r requirements-py3.txt
-django==1.11.29           # via -r requirements-py3.txt, django-auth-ldap, django-cas-ng, django-csp, mozilla-django-oidc
-elasticsearch==6.8.2      # via -r requirements-py3.txt
-filelock==3.0.12          # via tox, virtualenv
-funcparserlib==1.0.0a0    # via mockldap
-future==0.18.2            # via -r requirements-py3.txt, metsrw
-gearman3==0.2.1 ; python_version >= "3"  # via -r requirements-py3.txt
-gevent==1.3.6             # via -r requirements-py3.txt
-greenlet==1.1.0           # via -r requirements-py3.txt, gevent
-gunicorn==19.9.0          # via -r requirements-py3.txt
-idna==2.10                # via -r requirements-py3.txt, requests, yarl
-importlib-metadata==4.5.0  # via -r requirements-py3.txt, click, pluggy, pytest, tox, virtualenv
-importlib-resources==5.1.4  # via virtualenv
-inotify_simple==1.1.8     # via -r requirements-py3.txt
-josepy==1.8.0             # via -r requirements-py3.txt, mozilla-django-oidc
-jsonschema==2.6.0         # via -r requirements-py3.txt
-lazy-paged-sequence==0.3  # via -r requirements-py3.txt
-logutils==0.3.3           # via -r requirements-py3.txt
-lxml==4.6.3               # via -r requirements-py3.txt, ammcpc, metsrw, python-cas
-metsrw==0.3.20            # via -r requirements-py3.txt
-mock==4.0.3               # via -r requirements-dev-py3.in
-git+https://github.com/artefactual-labs/mockldap@v0.3.1#egg=mockldap  # via -r requirements-dev-py3.in
-more-itertools==8.8.0     # via pytest
-mozilla-django-oidc==1.2.4  # via -r requirements-py3.txt
-multidict==5.1.0          # via yarl
-mysqlclient==1.4.6        # via -r requirements-py3.txt, agentarchives
-ndg-httpsclient==0.5.1    # via -r requirements-py3.txt
-olefile==0.46             # via -r requirements-py3.txt, opf-fido
-opf-fido==1.4.1           # via -r requirements-py3.txt
-packaging==20.9           # via pytest, tox
-pip-tools==5.4.0          # via -r requirements-py3.txt
-pluggy==0.13.1            # via pytest, tox
-prometheus-client==0.7.1  # via -r requirements-py3.txt, django-prometheus
-py==1.10.0                # via pytest, tox
-pyasn1-modules==0.2.8     # via -r requirements-py3.txt, python-ldap
-pyasn1==0.4.8             # via -r requirements-py3.txt, ndg-httpsclient, pyasn1-modules, python-ldap
-pycparser==2.20           # via -r requirements-py3.txt, cffi
-pyldap==3.0.0.post1       # via -r requirements-py3.txt, django-auth-ldap
-pyopenssl==20.0.1         # via -r requirements-py3.txt, josepy, ndg-httpsclient
-pyparsing==2.4.7          # via packaging
-pytest-cov==2.4.0         # via -r requirements-dev-py3.in
-pytest-django==3.10.0     # via -r requirements-dev-py3.in
-pytest-mock==1.13.0       # via -r requirements-dev-py3.in
-pytest-pythonpath==0.7.3  # via -r requirements-dev-py3.in
-pytest-randomly==1.2.3    # via -r requirements-dev-py3.in
-pytest==4.6.11            # via -r requirements-dev-py3.in, pytest-cov, pytest-django, pytest-mock, pytest-pythonpath, pytest-randomly
-python-cas==1.5.0         # via -r requirements-py3.txt, django-cas-ng
-python-dateutil==2.6.0    # via -r requirements-py3.txt, django-tastypie
-python-ldap==3.2.0        # via -r requirements-py3.txt, mockldap, pyldap
-python-mimeparse==1.6.0   # via -r requirements-py3.txt, django-tastypie
-pytz==2021.1              # via -r requirements-py3.txt, django
-pyyaml==5.4.1             # via vcrpy
-requests==2.25.1          # via -r requirements-py3.txt, agentarchives, amclient, mozilla-django-oidc, python-cas
-scandir==1.10.0           # via -r requirements-py3.txt
-six==1.14.0               # via -r requirements-py3.txt, amclient, django-extensions, metsrw, mozilla-django-oidc, opf-fido, pip-tools, pyopenssl, pytest, python-cas, python-dateutil, tox, vcrpy, virtualenv
-toml==0.10.2              # via tox
-tox==3.23.1               # via -r requirements-dev-py3.in
-typing-extensions==3.10.0.0  # via -r requirements-py3.txt, importlib-metadata, yarl
-unidecode==0.04.19        # via -r requirements-py3.txt
-urllib3==1.26.5           # via -r requirements-py3.txt, amclient, elasticsearch, requests
-vcrpy==1.13.0             # via -r requirements-dev-py3.in
-virtualenv==20.4.7        # via tox
-wcwidth==0.2.5            # via pytest
-whitenoise==3.3.0         # via -r requirements-py3.txt
-wrapt==1.12.1             # via vcrpy
-yarl==1.6.3               # via vcrpy
-zipp==3.4.1               # via -r requirements-py3.txt, importlib-metadata, importlib-resources
-
-# The following packages are considered to be unsafe in a requirements file:
-pip==21.1.2 ; python_version >= "3"  # via -r requirements-py3.txt, pip-tools
-setuptools==57.0.0        # via -r requirements-py3.txt, josepy, opf-fido
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 08cb5538d4..3c71d2f64f 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,110 +1,329 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.6
 # To update, run:
 #
 #    pip-compile --allow-unsafe --output-file=requirements-dev.txt requirements-dev.in
 #
-agentarchives==0.7.0      # via -r requirements.txt
-amclient==1.1.1           # via -r requirements.txt
-ammcpc==0.1.3             # via -r requirements.txt
-appdirs==1.4.4            # via virtualenv
-atomicwrites==1.4.0       # via pytest
-attrs==21.2.0             # via pytest
-backports.functools-lru-cache==1.6.4  # via wcwidth
-bagit==1.7.0              # via -r requirements.txt
-brotli==0.5.2             # via -r requirements.txt
-certifi==2021.5.30        # via -r requirements.txt, requests
-cffi==1.14.5              # via -r requirements.txt, cryptography
-chardet==4.0.0            # via -r requirements.txt, requests
-clamd==1.0.2              # via -r requirements.txt
-click==7.1.2              # via -r requirements.txt, pip-tools
-configparser==4.0.2       # via importlib-metadata
-contextdecorator==0.10.0 ; python_version < "3.2"  # via -r requirements.txt
-contextlib2==0.6.0.post1  # via importlib-metadata, importlib-resources, vcrpy, zipp
-coverage==4.2             # via -r requirements-dev.in, pytest-cov
-cryptography==3.3.2       # via -r requirements.txt, josepy, mozilla-django-oidc, pyopenssl
-distlib==0.3.2            # via virtualenv
-django-auth-ldap==1.3.0   # via -r requirements.txt
-django-autoslug==1.9.3    # via -r requirements.txt
-django-braces==1.0.0      # via -r requirements.txt
-django-cas-ng==3.6.0      # via -r requirements.txt
-django-csp==3.7.0         # via -r requirements.txt
-django-extensions==1.7.9  # via -r requirements.txt
-django-forms-bootstrap==3.1.0  # via -r requirements.txt
-django-prometheus==1.0.15  # via -r requirements.txt
-git+https://github.com/Brown-University-Library/django-shibboleth-remoteuser.git@67d270c65c201606fb86d548493d4b3fd8cc7a76#egg=django-shibboleth-remoteuser  # via -r requirements.txt
-django-tastypie==0.13.2   # via -r requirements.txt
-django==1.11.29           # via -r requirements.txt, django-auth-ldap, django-cas-ng, django-csp, mozilla-django-oidc
-elasticsearch==6.8.2      # via -r requirements.txt
-enum34==1.1.6 ; python_version < "3.4"  # via -r requirements.txt, cryptography
-filelock==3.0.12          # via tox, virtualenv
-funcparserlib==1.0.0a0    # via mockldap
-funcsigs==1.0.2           # via mock, pytest
-functools32==3.2.3.post2  # via -r requirements.txt, jsonschema
-future==0.18.2            # via -r requirements.txt, metsrw
-futures==3.3.0 ; python_version < "3.2"  # via -r requirements.txt
-gearman==2.0.2 ; python_version < "3"  # via -r requirements.txt
-gevent==1.3.6             # via -r requirements.txt
-greenlet==1.1.0           # via -r requirements.txt, gevent
-gunicorn==19.9.0          # via -r requirements.txt
-idna==2.10                # via -r requirements.txt, requests
-importlib-metadata==2.1.1  # via pluggy, pytest, tox, virtualenv
-importlib-resources==3.3.1  # via virtualenv
-inotify_simple==1.1.8     # via -r requirements.txt
-ipaddress==1.0.23         # via -r requirements.txt, cryptography
-josepy==1.6.0             # via -r requirements.txt, mozilla-django-oidc
-jsonschema==2.6.0         # via -r requirements.txt
-lazy-paged-sequence==0.3  # via -r requirements.txt
-logutils==0.3.3           # via -r requirements.txt
-lxml==4.6.3               # via -r requirements.txt, ammcpc, metsrw, python-cas
-metsrw==0.3.20            # via -r requirements.txt
-mock==3.0.5               # via -r requirements-dev.in, mockldap, pytest-mock, vcrpy
-git+https://github.com/artefactual-labs/mockldap@v0.3.1#egg=mockldap  # via -r requirements-dev.in
-more-itertools==5.0.0     # via pytest
-mozilla-django-oidc==1.2.4  # via -r requirements.txt
-mysqlclient==1.4.6        # via -r requirements.txt, agentarchives
-ndg-httpsclient==0.5.1    # via -r requirements.txt
-olefile==0.46             # via -r requirements.txt, opf-fido
-opf-fido==1.4.1           # via -r requirements.txt
-packaging==20.9           # via pytest, tox
-pathlib2==2.3.4 ; python_version < "3"  # via -r requirements.txt, importlib-metadata, importlib-resources, pytest, pytest-django, virtualenv
-pip-tools==5.4.0          # via -r requirements.txt
-pluggy==0.13.1            # via pytest, tox
-prometheus-client==0.7.1  # via -r requirements.txt, django-prometheus
-py==1.10.0                # via pytest, tox
-pyasn1-modules==0.2.8     # via -r requirements.txt, python-ldap
-pyasn1==0.4.8             # via -r requirements.txt, ndg-httpsclient, pyasn1-modules, python-ldap
-pycparser==2.20           # via -r requirements.txt, cffi
-pyopenssl==20.0.1         # via -r requirements.txt, josepy, ndg-httpsclient
-pyparsing==2.4.7          # via packaging
-pytest-cov==2.4.0         # via -r requirements-dev.in
-pytest-django==3.10.0     # via -r requirements-dev.in
-pytest-mock==1.13.0       # via -r requirements-dev.in
-pytest-pythonpath==0.7.3  # via -r requirements-dev.in
-pytest-randomly==1.2.3    # via -r requirements-dev.in
-pytest==4.6.11            # via -r requirements-dev.in, pytest-cov, pytest-django, pytest-mock, pytest-pythonpath, pytest-randomly
-python-cas==1.5.0         # via -r requirements.txt, django-cas-ng
-python-dateutil==2.6.0    # via -r requirements.txt, django-tastypie
-python-ldap==3.2.0        # via -r requirements.txt, django-auth-ldap, mockldap
-python-mimeparse==1.6.0   # via -r requirements.txt, django-tastypie
-pytz==2021.1              # via -r requirements.txt, django
-pyyaml==5.4.1             # via vcrpy
-requests==2.25.1          # via -r requirements.txt, agentarchives, amclient, mozilla-django-oidc, python-cas
-scandir==1.10.0           # via -r requirements.txt, pathlib2
-singledispatch==3.6.2     # via importlib-resources
-six==1.14.0               # via -r requirements.txt, amclient, cryptography, django-extensions, josepy, metsrw, mock, more-itertools, mozilla-django-oidc, opf-fido, pathlib2, pip-tools, pyopenssl, pytest, python-cas, python-dateutil, tox, vcrpy, virtualenv
-toml==0.10.2              # via tox
-tox==3.23.1               # via -r requirements-dev.in
-typing==3.10.0.0          # via importlib-resources
-unidecode==0.04.19        # via -r requirements.txt
-urllib3==1.26.5           # via -r requirements.txt, amclient, elasticsearch, requests
-vcrpy==1.13.0             # via -r requirements-dev.in
-virtualenv==20.4.7        # via tox
-wcwidth==0.2.5            # via pytest
-whitenoise==3.3.0         # via -r requirements.txt
-wrapt==1.12.1             # via vcrpy
-zipp==1.2.0               # via importlib-metadata, importlib-resources
+agentarchives==0.7.0
+    # via -r requirements.txt
+amclient==1.1.1
+    # via -r requirements.txt
+ammcpc==0.1.3
+    # via -r requirements.txt
+atomicwrites==1.4.0
+    # via pytest
+attrs==21.2.0
+    # via pytest
+backports.entry-points-selectable==1.1.0
+    # via virtualenv
+bagit==1.7.0
+    # via -r requirements.txt
+brotli==0.5.2
+    # via -r requirements.txt
+certifi==2021.5.30
+    # via
+    #   -r requirements.txt
+    #   requests
+cffi==1.14.6
+    # via
+    #   -r requirements.txt
+    #   cryptography
+charset-normalizer==2.0.1
+    # via
+    #   -r requirements.txt
+    #   requests
+clamd==1.0.2
+    # via -r requirements.txt
+click==8.0.1
+    # via
+    #   -r requirements.txt
+    #   pip-tools
+coverage==4.2
+    # via
+    #   -r requirements-dev.in
+    #   pytest-cov
+cryptography==3.4.7
+    # via
+    #   -r requirements.txt
+    #   josepy
+    #   mozilla-django-oidc
+    #   pyopenssl
+distlib==0.3.3
+    # via virtualenv
+django==1.11.29
+    # via
+    #   -r requirements.txt
+    #   django-auth-ldap
+    #   django-cas-ng
+    #   django-csp
+    #   mozilla-django-oidc
+django-auth-ldap==1.3.0
+    # via -r requirements.txt
+django-autoslug==1.9.3
+    # via -r requirements.txt
+django-braces==1.0.0
+    # via -r requirements.txt
+django-cas-ng==3.6.0
+    # via -r requirements.txt
+django-csp==3.7.0
+    # via -r requirements.txt
+django-extensions==1.7.9
+    # via -r requirements.txt
+django-forms-bootstrap==3.1.0
+    # via -r requirements.txt
+django-prometheus==1.0.15
+    # via -r requirements.txt
+django-shibboleth-remoteuser @ git+https://github.com/Brown-University-Library/django-shibboleth-remoteuser.git@67d270c65c201606fb86d548493d4b3fd8cc7a76
+    # via -r requirements.txt
+django-tastypie==0.13.2
+    # via -r requirements.txt
+elasticsearch==6.8.2
+    # via -r requirements.txt
+filelock==3.3.1
+    # via
+    #   tox
+    #   virtualenv
+funcparserlib==1.0.0a0
+    # via mockldap
+future==0.18.2
+    # via
+    #   -r requirements.txt
+    #   metsrw
+gearman3==0.2.1
+    # via -r requirements.txt
+gevent==1.3.6
+    # via -r requirements.txt
+greenlet==1.1.0
+    # via
+    #   -r requirements.txt
+    #   gevent
+gunicorn==19.9.0
+    # via -r requirements.txt
+idna==3.2
+    # via
+    #   -r requirements.txt
+    #   requests
+    #   yarl
+importlib-metadata==4.6.1
+    # via
+    #   -r requirements.txt
+    #   backports.entry-points-selectable
+    #   click
+    #   pep517
+    #   pluggy
+    #   pytest
+    #   tox
+    #   virtualenv
+importlib-resources==5.3.0
+    # via virtualenv
+inotify_simple==1.1.8
+    # via -r requirements.txt
+josepy==1.8.0
+    # via
+    #   -r requirements.txt
+    #   mozilla-django-oidc
+jsonschema==2.6.0
+    # via -r requirements.txt
+lazy-paged-sequence==0.3
+    # via -r requirements.txt
+logutils==0.3.3
+    # via -r requirements.txt
+lxml==4.6.3
+    # via
+    #   -r requirements.txt
+    #   ammcpc
+    #   metsrw
+    #   python-cas
+metsrw==0.3.20
+    # via -r requirements.txt
+mock==4.0.3
+    # via -r requirements-dev.in
+mockldap @ git+https://github.com/artefactual-labs/mockldap@v0.3.1
+    # via -r requirements-dev.in
+more-itertools==8.10.0
+    # via pytest
+mozilla-django-oidc==1.2.4
+    # via -r requirements.txt
+multidict==5.2.0
+    # via yarl
+mysqlclient==1.4.6
+    # via
+    #   -r requirements.txt
+    #   agentarchives
+ndg-httpsclient==0.5.1
+    # via -r requirements.txt
+olefile==0.46
+    # via
+    #   -r requirements.txt
+    #   opf-fido
+opf-fido==1.4.1
+    # via -r requirements.txt
+packaging==21.0
+    # via
+    #   pytest
+    #   tox
+pep517==0.12.0
+    # via
+    #   -r requirements.txt
+    #   pip-tools
+pip-tools==6.4.0
+    # via -r requirements.txt
+platformdirs==2.4.0
+    # via virtualenv
+pluggy==0.13.1
+    # via
+    #   pytest
+    #   tox
+prometheus-client==0.7.1
+    # via
+    #   -r requirements.txt
+    #   django-prometheus
+py==1.10.0
+    # via
+    #   pytest
+    #   tox
+pyasn1==0.4.8
+    # via
+    #   -r requirements.txt
+    #   ndg-httpsclient
+    #   pyasn1-modules
+    #   python-ldap
+pyasn1-modules==0.2.8
+    # via
+    #   -r requirements.txt
+    #   python-ldap
+pycparser==2.20
+    # via
+    #   -r requirements.txt
+    #   cffi
+pyldap==3.0.0.post1
+    # via
+    #   -r requirements.txt
+    #   django-auth-ldap
+pyopenssl==20.0.1
+    # via
+    #   -r requirements.txt
+    #   josepy
+    #   ndg-httpsclient
+pyparsing==2.4.7
+    # via packaging
+pytest==4.6.11
+    # via
+    #   -r requirements-dev.in
+    #   pytest-cov
+    #   pytest-django
+    #   pytest-mock
+    #   pytest-pythonpath
+    #   pytest-randomly
+pytest-cov==2.4.0
+    # via -r requirements-dev.in
+pytest-django==3.10.0
+    # via -r requirements-dev.in
+pytest-mock==1.13.0
+    # via -r requirements-dev.in
+pytest-pythonpath==0.7.3
+    # via -r requirements-dev.in
+pytest-randomly==1.2.3
+    # via -r requirements-dev.in
+python-cas==1.5.0
+    # via
+    #   -r requirements.txt
+    #   django-cas-ng
+python-dateutil==2.6.0
+    # via
+    #   -r requirements.txt
+    #   django-tastypie
+python-ldap==3.2.0
+    # via
+    #   -r requirements.txt
+    #   mockldap
+    #   pyldap
+python-mimeparse==1.6.0
+    # via
+    #   -r requirements.txt
+    #   django-tastypie
+pytz==2021.1
+    # via
+    #   -r requirements.txt
+    #   django
+pyyaml==6.0
+    # via vcrpy
+requests==2.26.0
+    # via
+    #   -r requirements.txt
+    #   agentarchives
+    #   amclient
+    #   mozilla-django-oidc
+    #   python-cas
+scandir==1.10.0
+    # via -r requirements.txt
+six==1.14.0
+    # via
+    #   -r requirements.txt
+    #   amclient
+    #   django-extensions
+    #   metsrw
+    #   mozilla-django-oidc
+    #   opf-fido
+    #   pyopenssl
+    #   pytest
+    #   python-cas
+    #   python-dateutil
+    #   tox
+    #   vcrpy
+    #   virtualenv
+toml==0.10.2
+    # via tox
+tomli==1.2.1
+    # via
+    #   -r requirements.txt
+    #   pep517
+tox==3.24.4
+    # via -r requirements-dev.in
+typing-extensions==3.10.0.0
+    # via
+    #   -r requirements.txt
+    #   importlib-metadata
+    #   yarl
+unidecode==0.04.19
+    # via -r requirements.txt
+urllib3==1.26.6
+    # via
+    #   -r requirements.txt
+    #   amclient
+    #   elasticsearch
+    #   requests
+vcrpy==1.13.0
+    # via -r requirements-dev.in
+virtualenv==20.8.1
+    # via tox
+wcwidth==0.2.5
+    # via pytest
+wheel==0.37.0
+    # via
+    #   -r requirements.txt
+    #   pip-tools
+whitenoise==3.3.0
+    # via -r requirements.txt
+wrapt==1.13.2
+    # via vcrpy
+yarl==1.7.0
+    # via vcrpy
+zipp==3.5.0
+    # via
+    #   -r requirements.txt
+    #   importlib-metadata
+    #   importlib-resources
+    #   pep517
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==20.3.4 ; python_version < "3"  # via -r requirements.txt, pip-tools
-setuptools==44.1.1        # via -r requirements.txt, josepy, opf-fido
+pip==21.3.1
+    # via
+    #   -r requirements.txt
+    #   pip-tools
+setuptools==57.1.0
+    # via
+    #   -r requirements.txt
+    #   josepy
+    #   opf-fido
+    #   pip-tools
diff --git a/requirements-py3.txt b/requirements-py3.txt
deleted file mode 100644
index 8996ae95af..0000000000
--- a/requirements-py3.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    pip-compile --allow-unsafe --output-file=requirements-py3.txt requirements.in
-#
-agentarchives==0.7.0      # via -r requirements.in
-amclient==1.1.1           # via -r requirements.in
-ammcpc==0.1.3             # via -r requirements.in
-bagit==1.7.0              # via -r requirements.in
-brotli==0.5.2             # via -r requirements.in
-certifi==2021.5.30        # via requests
-cffi==1.14.5              # via cryptography
-chardet==4.0.0            # via requests
-clamd==1.0.2              # via -r requirements.in
-click==8.0.1              # via pip-tools
-cryptography==3.4.7       # via josepy, mozilla-django-oidc, pyopenssl
-django-auth-ldap==1.3.0   # via -r requirements.in
-django-autoslug==1.9.3    # via -r requirements.in
-django-braces==1.0.0      # via -r requirements.in
-django-cas-ng==3.6.0      # via -r requirements.in
-django-csp==3.7.0         # via -r requirements.in
-django-extensions==1.7.9  # via -r requirements.in
-django-forms-bootstrap==3.1.0  # via -r requirements.in
-django-prometheus==1.0.15  # via -r requirements.in
-git+https://github.com/Brown-University-Library/django-shibboleth-remoteuser.git@67d270c65c201606fb86d548493d4b3fd8cc7a76#egg=django-shibboleth-remoteuser  # via -r requirements.in
-django-tastypie==0.13.2   # via -r requirements.in
-django==1.11.29           # via -r requirements.in, django-auth-ldap, django-cas-ng, django-csp, mozilla-django-oidc
-elasticsearch==6.8.2      # via -r requirements.in
-future==0.18.2            # via metsrw
-gearman3==0.2.1 ; python_version >= "3"  # via -r requirements.in
-gevent==1.3.6             # via -r requirements.in
-greenlet==1.1.0           # via gevent
-gunicorn==19.9.0          # via -r requirements.in
-idna==2.10                # via requests
-importlib-metadata==4.5.0  # via click
-inotify_simple==1.1.8     # via -r requirements.in
-josepy==1.8.0             # via mozilla-django-oidc
-jsonschema==2.6.0         # via -r requirements.in
-lazy-paged-sequence==0.3  # via -r requirements.in
-logutils==0.3.3           # via -r requirements.in
-lxml==4.6.3               # via -r requirements.in, ammcpc, metsrw, python-cas
-metsrw==0.3.20            # via -r requirements.in
-mozilla-django-oidc==1.2.4  # via -r requirements.in
-mysqlclient==1.4.6        # via -r requirements.in, agentarchives
-ndg-httpsclient==0.5.1    # via -r requirements.in
-olefile==0.46             # via opf-fido
-opf-fido==1.4.1           # via -r requirements.in
-pip-tools==5.4.0          # via -r requirements.in
-prometheus-client==0.7.1  # via -r requirements.in, django-prometheus
-pyasn1-modules==0.2.8     # via python-ldap
-pyasn1==0.4.8             # via -r requirements.in, ndg-httpsclient, pyasn1-modules, python-ldap
-pycparser==2.20           # via cffi
-pyldap==3.0.0.post1       # via django-auth-ldap
-pyopenssl==20.0.1         # via -r requirements.in, josepy, ndg-httpsclient
-python-cas==1.5.0         # via django-cas-ng
-python-dateutil==2.6.0    # via -r requirements.in, django-tastypie
-python-ldap==3.2.0        # via -r requirements.in, pyldap
-python-mimeparse==1.6.0   # via django-tastypie
-pytz==2021.1              # via -r requirements.in, django
-requests==2.25.1          # via -r requirements.in, agentarchives, amclient, mozilla-django-oidc, python-cas
-scandir==1.10.0           # via -r requirements.in
-six==1.14.0               # via -r requirements.in, amclient, django-extensions, metsrw, mozilla-django-oidc, opf-fido, pip-tools, pyopenssl, python-cas, python-dateutil
-typing-extensions==3.10.0.0  # via importlib-metadata
-unidecode==0.04.19        # via -r requirements.in
-urllib3==1.26.5           # via amclient, elasticsearch, requests
-whitenoise==3.3.0         # via -r requirements.in
-zipp==3.4.1               # via importlib-metadata
-
-# The following packages are considered to be unsafe in a requirements file:
-pip==21.1.2 ; python_version >= "3"  # via -r requirements.in, pip-tools
-setuptools==57.0.0        # via josepy, opf-fido
diff --git a/requirements.in b/requirements.in
index 6c74254a37..f4d5094510 100644
--- a/requirements.in
+++ b/requirements.in
@@ -6,7 +6,6 @@ ammcpc==0.1.3
 bagit==1.7.0
 brotli==0.5.2  # Better compression library for WhiteNoise
 clamd==1.0.2
-contextdecorator==0.10.0; python_version < "3.2"
 django-autoslug==1.9.3  # used by fpr
 django-braces==1.0.0
 django-csp==3.7.0
@@ -15,10 +14,7 @@ django-forms-bootstrap>=3.0.0,<4.0.0
 django-prometheus==1.0.15
 django-tastypie==0.13.2
 elasticsearch>=6.0.0,<7.0.0
-enum34==1.1.6; python_version < "3.4" # required by inotify_simple
-futures==3.3.0; python_version < "3.2"
-gearman==2.0.2; python_version < "3"
-gearman3==0.2.1; python_version >= "3"
+gearman3==0.2.1
 gevent==1.3.6  # used by gunicorn's async workers
 gunicorn==19.9.0
 inotify_simple==1.1.8
@@ -30,10 +26,8 @@ metsrw==0.3.20
 mysqlclient==1.4.6
 ndg-httpsclient
 opf-fido==1.4.1
-pathlib2==2.3.4 ; python_version < '3'
-pip~=20.3 ; python_version < '3'
-pip~=21.1 ; python_version >= '3'
-pip-tools==5.4.0
+pip~=21.3
+pip-tools==6.4.0
 prometheus_client==0.7.1
 pyasn1
 pyopenssl
diff --git a/requirements.txt b/requirements.txt
index 803395d68c..f8561e6fa8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,74 +1,197 @@
 #
-# This file is autogenerated by pip-compile
+# This file is autogenerated by pip-compile with python 3.6
 # To update, run:
 #
 #    pip-compile --allow-unsafe --output-file=requirements.txt requirements.in
 #
-agentarchives==0.7.0      # via -r requirements.in
-amclient==1.1.1           # via -r requirements.in
-ammcpc==0.1.3             # via -r requirements.in
-bagit==1.7.0              # via -r requirements.in
-brotli==0.5.2             # via -r requirements.in
-certifi==2021.5.30        # via requests
-cffi==1.14.5              # via cryptography
-chardet==4.0.0            # via requests
-clamd==1.0.2              # via -r requirements.in
-click==7.1.2              # via pip-tools
-contextdecorator==0.10.0 ; python_version < "3.2"  # via -r requirements.in
-cryptography==3.3.2       # via josepy, mozilla-django-oidc, pyopenssl
-django-auth-ldap==1.3.0   # via -r requirements.in
-django-autoslug==1.9.3    # via -r requirements.in
-django-braces==1.0.0      # via -r requirements.in
-django-cas-ng==3.6.0      # via -r requirements.in
-django-csp==3.7.0         # via -r requirements.in
-django-extensions==1.7.9  # via -r requirements.in
-django-forms-bootstrap==3.1.0  # via -r requirements.in
-django-prometheus==1.0.15  # via -r requirements.in
-git+https://github.com/Brown-University-Library/django-shibboleth-remoteuser.git@67d270c65c201606fb86d548493d4b3fd8cc7a76#egg=django-shibboleth-remoteuser  # via -r requirements.in
-django-tastypie==0.13.2   # via -r requirements.in
-django==1.11.29           # via -r requirements.in, django-auth-ldap, django-cas-ng, django-csp, mozilla-django-oidc
-elasticsearch==6.8.2      # via -r requirements.in
-enum34==1.1.6 ; python_version < "3.4"  # via -r requirements.in, cryptography
-functools32==3.2.3.post2  # via jsonschema
-future==0.18.2            # via metsrw
-futures==3.3.0 ; python_version < "3.2"  # via -r requirements.in
-gearman==2.0.2 ; python_version < "3"  # via -r requirements.in
-gevent==1.3.6             # via -r requirements.in
-greenlet==1.1.0           # via gevent
-gunicorn==19.9.0          # via -r requirements.in
-idna==2.10                # via requests
-inotify_simple==1.1.8     # via -r requirements.in
-ipaddress==1.0.23         # via cryptography
-josepy==1.6.0             # via mozilla-django-oidc
-jsonschema==2.6.0         # via -r requirements.in
-lazy-paged-sequence==0.3  # via -r requirements.in
-logutils==0.3.3           # via -r requirements.in
-lxml==4.6.3               # via -r requirements.in, ammcpc, metsrw, python-cas
-metsrw==0.3.20            # via -r requirements.in
-mozilla-django-oidc==1.2.4  # via -r requirements.in
-mysqlclient==1.4.6        # via -r requirements.in, agentarchives
-ndg-httpsclient==0.5.1    # via -r requirements.in
-olefile==0.46             # via opf-fido
-opf-fido==1.4.1           # via -r requirements.in
-pathlib2==2.3.4 ; python_version < "3"  # via -r requirements.in
-pip-tools==5.4.0          # via -r requirements.in
-prometheus-client==0.7.1  # via -r requirements.in, django-prometheus
-pyasn1-modules==0.2.8     # via python-ldap
-pyasn1==0.4.8             # via -r requirements.in, ndg-httpsclient, pyasn1-modules, python-ldap
-pycparser==2.20           # via cffi
-pyopenssl==20.0.1         # via -r requirements.in, josepy, ndg-httpsclient
-python-cas==1.5.0         # via django-cas-ng
-python-dateutil==2.6.0    # via -r requirements.in, django-tastypie
-python-ldap==3.2.0        # via -r requirements.in, django-auth-ldap
-python-mimeparse==1.6.0   # via django-tastypie
-pytz==2021.1              # via -r requirements.in, django
-requests==2.25.1          # via -r requirements.in, agentarchives, amclient, mozilla-django-oidc, python-cas
-scandir==1.10.0           # via -r requirements.in, pathlib2
-six==1.14.0               # via -r requirements.in, amclient, cryptography, django-extensions, josepy, metsrw, mozilla-django-oidc, opf-fido, pathlib2, pip-tools, pyopenssl, python-cas, python-dateutil
-unidecode==0.04.19        # via -r requirements.in
-urllib3==1.26.5           # via amclient, elasticsearch, requests
-whitenoise==3.3.0         # via -r requirements.in
+agentarchives==0.7.0
+    # via -r requirements.in
+amclient==1.1.1
+    # via -r requirements.in
+ammcpc==0.1.3
+    # via -r requirements.in
+bagit==1.7.0
+    # via -r requirements.in
+brotli==0.5.2
+    # via -r requirements.in
+certifi==2021.5.30
+    # via requests
+cffi==1.14.6
+    # via cryptography
+charset-normalizer==2.0.1
+    # via requests
+clamd==1.0.2
+    # via -r requirements.in
+click==8.0.1
+    # via pip-tools
+cryptography==3.4.7
+    # via
+    #   josepy
+    #   mozilla-django-oidc
+    #   pyopenssl
+django==1.11.29
+    # via
+    #   -r requirements.in
+    #   django-auth-ldap
+    #   django-cas-ng
+    #   django-csp
+    #   mozilla-django-oidc
+django-auth-ldap==1.3.0
+    # via -r requirements.in
+django-autoslug==1.9.3
+    # via -r requirements.in
+django-braces==1.0.0
+    # via -r requirements.in
+django-cas-ng==3.6.0
+    # via -r requirements.in
+django-csp==3.7.0
+    # via -r requirements.in
+django-extensions==1.7.9
+    # via -r requirements.in
+django-forms-bootstrap==3.1.0
+    # via -r requirements.in
+django-prometheus==1.0.15
+    # via -r requirements.in
+django-shibboleth-remoteuser @ git+https://github.com/Brown-University-Library/django-shibboleth-remoteuser.git@67d270c65c201606fb86d548493d4b3fd8cc7a76
+    # via -r requirements.in
+django-tastypie==0.13.2
+    # via -r requirements.in
+elasticsearch==6.8.2
+    # via -r requirements.in
+future==0.18.2
+    # via metsrw
+gearman3==0.2.1
+    # via -r requirements.in
+gevent==1.3.6
+    # via -r requirements.in
+greenlet==1.1.0
+    # via gevent
+gunicorn==19.9.0
+    # via -r requirements.in
+idna==3.2
+    # via requests
+importlib-metadata==4.6.1
+    # via
+    #   click
+    #   pep517
+inotify_simple==1.1.8
+    # via -r requirements.in
+josepy==1.8.0
+    # via mozilla-django-oidc
+jsonschema==2.6.0
+    # via -r requirements.in
+lazy-paged-sequence==0.3
+    # via -r requirements.in
+logutils==0.3.3
+    # via -r requirements.in
+lxml==4.6.3
+    # via
+    #   -r requirements.in
+    #   ammcpc
+    #   metsrw
+    #   python-cas
+metsrw==0.3.20
+    # via -r requirements.in
+mozilla-django-oidc==1.2.4
+    # via -r requirements.in
+mysqlclient==1.4.6
+    # via
+    #   -r requirements.in
+    #   agentarchives
+ndg-httpsclient==0.5.1
+    # via -r requirements.in
+olefile==0.46
+    # via opf-fido
+opf-fido==1.4.1
+    # via -r requirements.in
+pep517==0.12.0
+    # via pip-tools
+pip-tools==6.4.0
+    # via -r requirements.in
+prometheus-client==0.7.1
+    # via
+    #   -r requirements.in
+    #   django-prometheus
+pyasn1==0.4.8
+    # via
+    #   -r requirements.in
+    #   ndg-httpsclient
+    #   pyasn1-modules
+    #   python-ldap
+pyasn1-modules==0.2.8
+    # via python-ldap
+pycparser==2.20
+    # via cffi
+pyldap==3.0.0.post1
+    # via django-auth-ldap
+pyopenssl==20.0.1
+    # via
+    #   -r requirements.in
+    #   josepy
+    #   ndg-httpsclient
+python-cas==1.5.0
+    # via django-cas-ng
+python-dateutil==2.6.0
+    # via
+    #   -r requirements.in
+    #   django-tastypie
+python-ldap==3.2.0
+    # via
+    #   -r requirements.in
+    #   pyldap
+python-mimeparse==1.6.0
+    # via django-tastypie
+pytz==2021.1
+    # via
+    #   -r requirements.in
+    #   django
+requests==2.26.0
+    # via
+    #   -r requirements.in
+    #   agentarchives
+    #   amclient
+    #   mozilla-django-oidc
+    #   python-cas
+scandir==1.10.0
+    # via -r requirements.in
+six==1.14.0
+    # via
+    #   -r requirements.in
+    #   amclient
+    #   django-extensions
+    #   metsrw
+    #   mozilla-django-oidc
+    #   opf-fido
+    #   pyopenssl
+    #   python-cas
+    #   python-dateutil
+tomli==1.2.1
+    # via pep517
+typing-extensions==3.10.0.0
+    # via importlib-metadata
+unidecode==0.04.19
+    # via -r requirements.in
+urllib3==1.26.6
+    # via
+    #   amclient
+    #   elasticsearch
+    #   requests
+wheel==0.37.0
+    # via pip-tools
+whitenoise==3.3.0
+    # via -r requirements.in
+zipp==3.5.0
+    # via
+    #   importlib-metadata
+    #   pep517
 
 # The following packages are considered to be unsafe in a requirements file:
-pip==20.3.4 ; python_version < "3"  # via -r requirements.in, pip-tools
-setuptools==44.1.1        # via josepy, opf-fido
+pip==21.3.1
+    # via
+    #   -r requirements.in
+    #   pip-tools
+setuptools==57.1.0
+    # via
+    #   josepy
+    #   opf-fido
+    #   pip-tools
diff --git a/tox.ini b/tox.ini
index dff4151b10..ae3cfe6f45 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,13 +2,13 @@
 skipsdist = True
 minversion = 2.7.0
 envlist =
-    py{27,36}-archivematica-common
-    py{27,36}-dashboard
-    py{27,36}-mcpserver
-    py{27,36}-mcpclient
-    py{27,36}-mcpclient-ensure-no-mutable-globals
-    py{27,36}-storage-service
-    py{27,36}-migrations-dashboard
+    py36-archivematica-common
+    py36-dashboard
+    py36-mcpserver
+    py36-mcpclient
+    py36-mcpclient-ensure-no-mutable-globals
+    py36-storage-service
+    py36-migrations-dashboard
     migrations-storage-service
     linting
 
@@ -64,37 +64,20 @@ changedir =
     mcpclient: {env:MCPCLIENT_ROOT}
     storage-service: {env:STORAGE_SERVICE_DIR}
 
-[testenv:py36-{archivematica-common,dashboard,mcpserver,mcpclient}]
-deps = -r{toxinidir}/requirements-dev-py3.txt
-
-[testenv:py27-mcpclient-ensure-no-mutable-globals]
-commands = python {env:MCPCLIENT_DIR}/ensure_no_mutable_globals.py
-
 [testenv:py36-mcpclient-ensure-no-mutable-globals]
-deps = -r{toxinidir}/requirements-dev-py3.txt
-commands = {[testenv:py27-mcpclient-ensure-no-mutable-globals]commands}
+commands = python {env:MCPCLIENT_DIR}/ensure_no_mutable_globals.py
 
-[testenv:py27-storage-service]
+[testenv:py36-storage-service]
 deps =
     -r{env:STORAGE_SERVICE_ROOT}/requirements/production.txt
     -r{env:STORAGE_SERVICE_ROOT}/requirements/test.txt
 
-[testenv:py36-storage-service]
-deps =
-    -r{env:STORAGE_SERVICE_ROOT}/requirements/production-py3.txt
-    -r{env:STORAGE_SERVICE_ROOT}/requirements/test-py3.txt
-
-[testenv:py27-migrations-dashboard]
-commands = django-admin makemigrations --check --dry-run
-
 [testenv:py36-migrations-dashboard]
-deps = -r{toxinidir}/requirements-dev-py3.txt
-commands = {[testenv:py27-migrations-dashboard]commands}
+commands = django-admin makemigrations --check --dry-run
 
 [testenv:migrations-storage-service]
-basepython = python3
 deps = {[testenv:py36-storage-service]deps}
-commands = django-admin makemigrations --check --dry-run
+commands = {[testenv:py36-migrations-dashboard]commands}
 
 [testenv:linting]
 basepython = python3