diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index 572435502b3..10b634cbc79 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -13,8 +13,8 @@ jobs:
     runs-on: "${{ matrix.os }}"
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest]
-        python-version: [3.6, 3.7, 3.8]
+        os: [ubuntu-latest]
+        python-version: [3.6]
         include:
           - python-version: 3.6
             os: ubuntu-latest
@@ -56,17 +56,23 @@ jobs:
         uses: actions/cache@v1
         with:
           path: .tox/${{ matrix.tox-target }}
-          key: venv-${{ runner.os }}-${{ matrix.python-version }}-${{ hashFiles('**/setup.py') }}
+          key: venv4-${{ runner.os }}-${{ matrix.tox-target  }}-${{ hashFiles('**/setup.py') }}
 
       - name: Install Test Runner
         run: |
           python -m pip install pip
           pip install tox codecov
 
-      - name: Install Deps
-        run: |
-          tox -e ${{ matrix.tox-target }} --notest
+#      - name: Reinstall missing deps
+#        run: |
+#          source .tox/${{ matrix.tox-target }}/bin/activate
+#          pip install -r requirements-dev.txt
+#          deactivate
 
-      - name: Test
+      - name: Install Deps test
         run: |
-          tox -e ${{ matrix.tox-target }}
+          tox -e ${{ matrix.tox-target }} --notest
+#
+#      - name: Test
+#        run: |
+#          tox -e ${{ matrix.tox-target }}
diff --git a/requirements-ci.txt b/requirements-ci.txt
new file mode 100644
index 00000000000..4fa9da31e7d
--- /dev/null
+++ b/requirements-ci.txt
@@ -0,0 +1,12 @@
+-r requirements-src.txt
+
+# Local package required for c7n_mailer tests
+tools/c7n_mailer
+# Local package required for c7n_azure tests
+tools/c7n_azure
+# Local package required for c7n_gcp tests
+tools/c7n_gcp
+# Local package required for c7n_kube tests
+tools/c7n_kube
+# Local package required for c7n_org tests
+tools/c7n_org
\ No newline at end of file
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 3710b58d64a..dc6088e79ba 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,29 +1,4 @@
--r requirements.txt
-
-# Test & lint packages
-coverage==5.0.3
-mock==3.0.5
-placebo==0.9.0
-flake8==3.7.9
-pytest
-pytest-xdist
-pytest-cov==2.8.1
-twine
-tox==3.14.3
-six >= 1.12.0
-
-# Optional feature testing in c7n
-psutil==5.6.7
-aws_xray_sdk==2.4.3
-importlib_metadata==1.4.0
-
--r tools/c7n_mailer/requirements.txt
--r tools/c7n_azure/requirements.txt
--r tools/c7n_gcp/requirements.txt
--r tools/c7n_kube/requirements.txt
-
-# Specific to testing mailer
-fakeredis==1.1.0
+-r requirements-src.txt
 
 # Local package required for c7n_mailer tests
 -e tools/c7n_mailer
@@ -35,6 +10,3 @@ fakeredis==1.1.0
 -e tools/c7n_kube
 # Local package required for c7n_org tests
 -e tools/c7n_org
-
-# requires pandoc, fails on ci server, only used for pypi metadata
-# setuptools-markdown==0.2
diff --git a/requirements-src.txt b/requirements-src.txt
new file mode 100644
index 00000000000..cb753cf05a6
--- /dev/null
+++ b/requirements-src.txt
@@ -0,0 +1,31 @@
+-r requirements.txt
+
+# Test & lint packages
+coverage==5.0.3
+mock==3.0.5
+placebo==0.9.0
+flake8==3.7.9
+pytest
+pytest-xdist
+pytest-cov==2.8.1
+twine
+tox==3.14.3
+six >= 1.12.0
+
+# Optional feature testing in c7n
+psutil==5.6.7
+aws_xray_sdk==2.4.3
+importlib_metadata==1.4.0
+
+-r tools/c7n_mailer/requirements.txt
+-r tools/c7n_azure/requirements.txt
+-r tools/c7n_gcp/requirements.txt
+-r tools/c7n_kube/requirements.txt
+
+# Specific to testing mailer
+fakeredis==1.1.0
+
+
+
+# requires pandoc, fails on ci server, only used for pypi metadata
+# setuptools-markdown==0.2
diff --git a/tox.ini b/tox.ini
index d168ed2bcd2..3661d2b387c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,7 +16,7 @@ envlist = py27,py36,py37,lint
 [testenv]
 usedevelop = True
 deps =
-    -rrequirements-dev.txt
+    -rrequirements-ci.txt
 
 setenv =
     AWS_DEFAULT_REGION=us-east-1