diff --git a/src/main/java/com/alibaba/druid/mock/MockResultSet.java b/src/main/java/com/alibaba/druid/mock/MockResultSet.java
index e6b0c9ae72..c06e3077bb 100644
--- a/src/main/java/com/alibaba/druid/mock/MockResultSet.java
+++ b/src/main/java/com/alibaba/druid/mock/MockResultSet.java
@@ -36,7 +36,6 @@ import java.sql.Time;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
diff --git a/src/main/java/com/alibaba/druid/mock/MockResultSetMetaData.java b/src/main/java/com/alibaba/druid/mock/MockResultSetMetaData.java
index 70b6334096..1d1f289788 100644
--- a/src/main/java/com/alibaba/druid/mock/MockResultSetMetaData.java
+++ b/src/main/java/com/alibaba/druid/mock/MockResultSetMetaData.java
@@ -32,8 +32,12 @@ public class MockResultSetMetaData implements ResultSetMetaData {
         return columns;
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public <T> T unwrap(Class<T> iface) throws SQLException {
+        if (ResultSetMetaData.class.isAssignableFrom(iface)) {
+            return (T) this;
+        }
         return null;
     }