diff --git a/redis/exceptions.py b/redis/exceptions.py
index 6bb5fa7846..34e381619d 100644
--- a/redis/exceptions.py
+++ b/redis/exceptions.py
@@ -8,16 +8,16 @@ class RedisError(Exception):
 class AuthenticationError(RedisError):
     pass
 
-
-class ConnectionError(RedisError):
+class ServerError(RedisError):
     pass
 
-
-class ResponseError(RedisError):
+class ConnectionError(ServerError):
     pass
 
+class InvalidResponse(ServerError):
+    pass
 
-class InvalidResponse(RedisError):
+class ResponseError(RedisError):
     pass