diff --git a/src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleSQLParserResourceTest.java b/src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleSQLParserResourceTest.java
index c2a827d19e..c1d4317a3c 100644
--- a/src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleSQLParserResourceTest.java
+++ b/src/test/java/com/alibaba/druid/sql/oracle/bvt/OracleSQLParserResourceTest.java
@@ -16,34 +16,34 @@ import com.alibaba.druid.util.JdbcUtils;
 public class OracleSQLParserResourceTest extends TestCase {
 
     public void test_0() throws Exception {
-//        exec_test("bvt/parser/oracle-0.txt");
-//        exec_test("bvt/parser/oracle-1.txt");
-//        exec_test("bvt/parser/oracle-2.txt");
-//        exec_test("bvt/parser/oracle-3.txt");
-//        exec_test("bvt/parser/oracle-4.txt");
-//        exec_test("bvt/parser/oracle-5.txt");
-//        exec_test("bvt/parser/oracle-6.txt"); // PARTITION
-//        exec_test("bvt/parser/oracle-7.txt");
-//        exec_test("bvt/parser/oracle-8.txt");
-//        exec_test("bvt/parser/oracle-9.txt");
-//        exec_test("bvt/parser/oracle-10.txt");
-//        exec_test("bvt/parser/oracle-11.txt");
-//        exec_test("bvt/parser/oracle-12.txt");
-//        exec_test("bvt/parser/oracle-13.txt");
-//        exec_test("bvt/parser/oracle-14.txt");
-//        exec_test("bvt/parser/oracle-15.txt");
-//        exec_test("bvt/parser/oracle-16.txt");
-//        exec_test("bvt/parser/oracle-17.txt");
-//        exec_test("bvt/parser/oracle-18.txt");
-//        exec_test("bvt/parser/oracle-19.txt");
-//        exec_test("bvt/parser/oracle-20.txt");
-//        exec_test("bvt/parser/oracle-21.txt");
-//        exec_test("bvt/parser/oracle-22.txt");
-//        exec_test("bvt/parser/oracle-23.txt");
-//        exec_test("bvt/parser/oracle-24.txt");
-//        exec_test("bvt/parser/oracle-25.txt");
-//        exec_test("bvt/parser/oracle-26.txt");
-//        exec_test("bvt/parser/oracle-27.txt");
+        exec_test("bvt/parser/oracle-0.txt");
+        exec_test("bvt/parser/oracle-1.txt");
+        exec_test("bvt/parser/oracle-2.txt");
+        exec_test("bvt/parser/oracle-3.txt");
+        exec_test("bvt/parser/oracle-4.txt");
+        exec_test("bvt/parser/oracle-5.txt");
+        exec_test("bvt/parser/oracle-6.txt"); // PARTITION
+        exec_test("bvt/parser/oracle-7.txt");
+        exec_test("bvt/parser/oracle-8.txt");
+        exec_test("bvt/parser/oracle-9.txt");
+        exec_test("bvt/parser/oracle-10.txt");
+        exec_test("bvt/parser/oracle-11.txt");
+        exec_test("bvt/parser/oracle-12.txt");
+        exec_test("bvt/parser/oracle-13.txt");
+        exec_test("bvt/parser/oracle-14.txt");
+        exec_test("bvt/parser/oracle-15.txt");
+        exec_test("bvt/parser/oracle-16.txt");
+        exec_test("bvt/parser/oracle-17.txt");
+        exec_test("bvt/parser/oracle-18.txt");
+        exec_test("bvt/parser/oracle-19.txt");
+        exec_test("bvt/parser/oracle-20.txt");
+        exec_test("bvt/parser/oracle-21.txt");
+        exec_test("bvt/parser/oracle-22.txt");
+        exec_test("bvt/parser/oracle-23.txt");
+        exec_test("bvt/parser/oracle-24.txt");
+        exec_test("bvt/parser/oracle-25.txt");
+        exec_test("bvt/parser/oracle-26.txt");
+        exec_test("bvt/parser/oracle-27.txt");
         exec_test("bvt/parser/oracle-28.txt");
     }
     
diff --git a/src/test/resources/bvt/parser/oracle-20.txt b/src/test/resources/bvt/parser/oracle-20.txt
index 25dbb501d1..30c88acbfd 100644
--- a/src/test/resources/bvt/parser/oracle-20.txt
+++ b/src/test/resources/bvt/parser/oracle-20.txt
@@ -13,4 +13,4 @@ ORDER BY RC_CLOT_TRUNK.NAME,RC_CLOT_INFO.id  NULLS LAST
 SELECT RC_CLOT_INFO_EXT.*, RC_CLOT_TRUNK.NAME AS TRUNK_NAME
 FROM RC_CLOT_INFO , RC_CLOT_INFO_EXT , RC_CLOT_TRUNK
 WHERE RC_CLOT_INFO.is_deleted = 'n' AND RC_CLOT_INFO.TRUNK_ID = RC_CLOT_TRUNK.ID AND RC_CLOT_INFO.ID = RC_CLOT_INFO_EXT.CLOT_ID AND RC_CLOT_INFO_EXT.GMT_MODIFIED >= ?
-ORDER BY RC_CLOT_TRUNK.NAME, RC_CLOT_INFO.id;
+ORDER BY RC_CLOT_TRUNK.NAME, RC_CLOT_INFO.id NULLS LAST;
diff --git a/src/test/resources/bvt/parser/oracle-21.txt b/src/test/resources/bvt/parser/oracle-21.txt
index 0aa74bab42..56642b90e4 100644
--- a/src/test/resources/bvt/parser/oracle-21.txt
+++ b/src/test/resources/bvt/parser/oracle-21.txt
@@ -18,7 +18,7 @@ select * from (
 ---------------------------
 SELECT *
 FROM (SELECT rownum AS rnm, z.*
-	FROM (SELECT DISTINCT DISTINCT(tt.id) AS use_less_id, tt.*
+	FROM (SELECT DISTINCT tt.id AS use_less_id, tt.*
 		FROM (SELECT t.*, rct.parent_id, RCT.NAME AS trunk_name
 			FROM rc_clot_info t , rc_clot_trunk rct
 			WHERE t.is_deleted = 'n' AND t.trunk_id = rct.id) tt