diff --git a/ci/asan_tests/ray-project/requirements.txt b/ci/asan_tests/ray-project/requirements.txt
index 351ffbb06..75bc4c528 100644
--- a/ci/asan_tests/ray-project/requirements.txt
+++ b/ci/asan_tests/ray-project/requirements.txt
@@ -2,7 +2,7 @@ aiohttp
 blist
 boto3
 cython==0.29.0
-dataclasses
+dataclasses; python_version < '3.7'
 dm-tree
 feather-format
 flask
diff --git a/python/requirements.txt b/python/requirements.txt
index 472e925de..3fefd37c8 100644
--- a/python/requirements.txt
+++ b/python/requirements.txt
@@ -38,13 +38,13 @@ tabulate
 tensorboardX
 uvicorn
 pydantic
-dataclasses
+dataclasses; python_version < '3.7'
 
 # Requirements for running tests
 blist; platform_system != "Windows"
 boto3
 cython==0.29.0
-dataclasses
+dataclasses; python_version < '3.7'
 dask[complete]
 feather-format
 gym
diff --git a/python/setup.py b/python/setup.py
index 89cede854..b2558e9ac 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -110,8 +110,14 @@ if os.getenv("RAY_USE_NEW_GCS") == "on":
 # in this directory
 extras = {
     "debug": [],
-    "serve": ["uvicorn", "flask", "requests", "pydantic", "dataclasses"],
-    "tune": ["tabulate", "tensorboardX", "pandas", "dataclasses"]
+    "serve": [
+        "uvicorn", "flask", "requests", "pydantic",
+        "dataclasses; python_version < '3.7'"
+    ],
+    "tune": [
+        "tabulate", "tensorboardX", "pandas",
+        "dataclasses; python_version < '3.7'"
+    ]
 }
 
 extras["rllib"] = extras["tune"] + [