diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 49cf2eda34a..f561d4cf271 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -152,7 +152,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        tox-environment: [ "docker-tests", "lint" ]
+        tox-environment: [ "docker-tests"]
     name: ${{ matrix.tox-environment }}
     runs-on: ubuntu-latest
     steps:
diff --git a/eachdist.ini b/eachdist.ini
index 1b809374ad9..9cef826d205 100644
--- a/eachdist.ini
+++ b/eachdist.ini
@@ -10,10 +10,6 @@ sortfirst=
     opentelemetry-instrumentation
     opentelemetry-proto
     tests/util
-    instrumentation/opentelemetry-instrumentation-wsgi
-    instrumentation/opentelemetry-instrumentation-dbapi
-    instrumentation/opentelemetry-instrumentation-asgi
-    instrumentation/opentelemetry-instrumentation-botocore
     instrumentation/*
     exporter/*
     ext/*
diff --git a/tox.ini b/tox.ini
index ac5e6079f84..d8f9956cecf 100644
--- a/tox.ini
+++ b/tox.ini
@@ -135,8 +135,10 @@ commands =
 basepython: python3.8
 recreate = True
 deps =
-  -e {toxinidir}/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-grpc
+  -e {toxinidir}/opentelemetry-api
+  -e {toxinidir}/opentelemetry-sdk
   -c dev-requirements.txt
+  -e {toxinidir}/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-grpc
   asgiref
   pylint
   flake8
@@ -154,19 +156,18 @@ commands =
 
 [testenv:docs]
 deps =
+  -e {toxinidir}/opentelemetry-api
+  -e {toxinidir}/opentelemetry-sdk
   -e {toxinidir}/opentelemetry-python-contrib/exporter/opentelemetry-exporter-datadog
+  -e {toxinidir}/opentelemetry-instrumentation
+  -e {toxinidir}/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-wsgi
   -e {toxinidir}/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-grpc
   -e {toxinidir}/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-flask
   -e {toxinidir}/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-django
   -e {toxinidir}/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-requests
-  -e {toxinidir}/opentelemetry-python-contrib/instrumentation/opentelemetry-instrumentation-wsgi
   -c {toxinidir}/dev-requirements.txt
   -r {toxinidir}/docs-requirements.txt
 
-commands_pre =
-  pip install -e {toxinidir}/opentelemetry-api \ 
-              -e {toxinidir}/opentelemetry-sdk
-
 changedir = docs
 
 commands =