diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 94fbd6c8..15824866 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -12,8 +12,7 @@ jobs:
       with:
         python-version: 3.6
     - name: Install
-      run: |
-        pip install dataclasses==0.7
+      run:
         pip install -e .
         pip install -r test-requirements.txt
     - name: Lint
diff --git a/setup.py b/setup.py
index 99af939a..90abcf68 100644
--- a/setup.py
+++ b/setup.py
@@ -18,16 +18,17 @@
     long_description_content_type='text/markdown',
     package_dir={'': 'src'},
     packages=find_packages('src'),
+    python_requires=">=3.6",
     install_requires=[
         'tensorflow_privacy==0.2.2',
         'sentencepiece==0.1.91',
         'smart_open==2.0.0',
         'tqdm<5.0',
         'pandas==1.0.3',
-        'numpy==1.18.3'
+        'numpy==1.18.3',
+        'dataclasses==0.7;python_version<"3.7"',
     ],
     extras_require={
-        'tf': ['tensorflow==2.1.0'],
-        'py36': ['dataclasses==0.7']
+        'tf': ['tensorflow==2.1.0']
     }
 )