diff --git a/common b/common
index a7af72b7e59..bc413ae5338 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit a7af72b7e5946d62fd3b4dc524d6406604488f6f
+Subproject commit bc413ae53380dbb9902c75c6c22ea5b67b1b0d2b
diff --git a/conftest.py b/readthedocs/conftest.py
similarity index 96%
rename from conftest.py
rename to readthedocs/conftest.py
index 75e70a89315..03c028c71ef 100644
--- a/conftest.py
+++ b/readthedocs/conftest.py
@@ -1,8 +1,7 @@
-# -*- coding: utf-8 -*-
 import pytest
-from django.conf import settings
 from rest_framework.test import APIClient
 
+
 try:
     # TODO: this file is read/executed even when called from ``readthedocsinc``,
     # so it's overriding the options that we are defining in the ``conftest.py``
diff --git a/requirements/testing.txt b/requirements/testing.txt
index ad507f71188..5a0283621ec 100644
--- a/requirements/testing.txt
+++ b/requirements/testing.txt
@@ -2,14 +2,9 @@
 -r local-docs-build.txt
 
 django-dynamic-fixture==2.0.0
-# pytest 4.2 is incompatible with pytest-django 3.4.6
-pytest==4.1.1  # pyup: <4.2
-# pytest-django 3.4.7 break our tests from corporate site
-# probably a bug related to overriding django settings in
-# previous tests
-pytest-django==3.4.6  # pyup: <3.4.7
-# pytest-xdist >1.27 requires pytest >4.1
-pytest-xdist==1.27.0  # pyup: ignore
+pytest==5.2.0
+pytest-django==3.5.1
+pytest-xdist==1.30.0
 pytest-cov==2.7.1
 apipkg==1.5
 execnet==1.7.1