diff --git a/src/connector/jdbc/src/test/java/TestPreparedStatement.java b/src/connector/jdbc/src/test/java/TestPreparedStatement.java
index 2e387206a41997eb629ead85b55fef9320ea7d14..4a8e03d3c148505908b2fb55ad99de92341591be 100644
--- a/src/connector/jdbc/src/test/java/TestPreparedStatement.java
+++ b/src/connector/jdbc/src/test/java/TestPreparedStatement.java
@@ -12,7 +12,10 @@ public class TestPreparedStatement {
             Class.forName("com.taosdata.jdbc.TSDBDriver");
             Properties properties = new Properties();
             properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, "localhost");
-            connection = DriverManager.getConnection("jdbc:TAOS://localhost:0/?user=root&password=taosdata", properties);
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_USER,"root");
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_PASSWORD,"taosdata");
+
+            connection = DriverManager.getConnection("jdbc:TAOS://localhost:0/", properties);
             String rawSql = "select * from test.log0601";
 //            String[] params = new String[]{"ts", "c1"};
             PreparedStatement pstmt = (TSDBPreparedStatement) connection.prepareStatement(rawSql);
diff --git a/src/connector/jdbc/src/test/java/TestTSDBDatabaseMetaData.java b/src/connector/jdbc/src/test/java/TestTSDBDatabaseMetaData.java
index f7e0e78441a9c2457a57605fe71e70a5dee609c2..401a4e0e7dc72b30b9b235ef0accd2e96901bc09 100644
--- a/src/connector/jdbc/src/test/java/TestTSDBDatabaseMetaData.java
+++ b/src/connector/jdbc/src/test/java/TestTSDBDatabaseMetaData.java
@@ -13,7 +13,10 @@ public class TestTSDBDatabaseMetaData {
             Class.forName("com.taosdata.jdbc.TSDBDriver");
             Properties properties = new Properties();
             properties.setProperty(TSDBDriver.PROPERTY_KEY_HOST, "localhost");
-            connection = DriverManager.getConnection("jdbc:TAOS://localhost:0/?user=root&password=taosdata", properties);
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_USER,"root");
+            properties.setProperty(TSDBDriver.PROPERTY_KEY_PASSWORD,"taosdata");
+
+            connection = DriverManager.getConnection("jdbc:TAOS://localhost:0/", properties);
             dbMetaData = connection.getMetaData();
             resSet = dbMetaData.getCatalogs();
             while(resSet.next()) {
diff --git a/src/connector/jdbc/src/test/java/TestTSDBSubscribe.java b/src/connector/jdbc/src/test/java/TestTSDBSubscribe.java
index df730efa69f5937b938f2556d39517a0aa15b3bb..bd3dbc2c4b1147d9dd8f030a7175eab8ed513e39 100644
--- a/src/connector/jdbc/src/test/java/TestTSDBSubscribe.java
+++ b/src/connector/jdbc/src/test/java/TestTSDBSubscribe.java
@@ -16,13 +16,13 @@ public class TestTSDBSubscribe {
         properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_USER,"root");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_PASSWORD,"taosdata");
 
-        String cs = String.format("jdbc:TAOS://%s:0/%s?user=root&password=taosdata", host, database);
+        String cs = String.format("jdbc:TAOS://%s:0/%s", host, database);
         return (TSDBConnection)DriverManager.getConnection(cs, properties);
     }
 
-
-
     public static void main(String[] args) throws Exception {
         String usage = "java -Djava.ext.dirs=../ TestTSDBSubscribe [-host host] <-db database> <-topic topic> <-sql sql>";
         if (args.length < 2) {
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/BatchInsertTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/BatchInsertTest.java
index cb78a5ca0eea5d780392fca95c29fe364ffcdbc3..e4187faafc5ddb423488d2e097fc37268493c924 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/BatchInsertTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/BatchInsertTest.java
@@ -40,8 +40,10 @@ public class BatchInsertTest extends BaseTest {
         properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
-        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/" + "?user=root&password=taosdata"
-                , properties);
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_USER,"root");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_PASSWORD,"taosdata");
+
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
                 
         statement = connection.createStatement();
         statement.executeUpdate("drop database if exists " + dbName);
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ConnectionTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ConnectionTest.java
index 3fc8913ca3d56b7fb492b0ff20ddd85d474c901a..b7706e5199f646c4010772f754d311f36dc1a3bb 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ConnectionTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ConnectionTest.java
@@ -29,16 +29,17 @@ public class ConnectionTest extends BaseTest {
         properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
-        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/" + "?user=root&password=taosdata"
-                , properties);
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_USER,"root");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_PASSWORD,"taosdata");
+
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
 
         assertTrue(null != connection);
         statement = connection.createStatement();
         assertTrue(null != statement);
 
         // try reconnect
-        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/" + "?user=root&password=taosdata"
-                , properties);
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
 
         try {
             statement.execute("create database if not exists " + dbName);
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/DatabaseMetaDataTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/DatabaseMetaDataTest.java
index 4c4d56020d8ea64e415001be9604808c5418b2af..d4df8a33fe78876f65b3188426a275b24470f069 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/DatabaseMetaDataTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/DatabaseMetaDataTest.java
@@ -26,8 +26,10 @@ public class DatabaseMetaDataTest extends BaseTest {
         properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
-        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/" + "?user=root&password=taosdata",
-                properties);
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_USER,"root");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_PASSWORD,"taosdata");
+
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/" , properties);
 
         String sql = "drop database if exists " + dbName;
         statement = (TSDBPreparedStatement) connection.prepareStatement(sql);
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ImportTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ImportTest.java
index 016eff1a359ccdb629dc9c27618ed3bee6091511..664b53f8e244a2b0cf3956255e9299502cf59859 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ImportTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ImportTest.java
@@ -28,8 +28,10 @@ public class ImportTest extends BaseTest {
         properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
-        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/" + "?user=root&password=taosdata"
-                , properties);
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_USER,"root");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_PASSWORD,"taosdata");
+
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
 
         statement = connection.createStatement();
         statement.executeUpdate("drop database if exists " + dbName);
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/PreparedStatementTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/PreparedStatementTest.java
index d391771269e57e602988e0857d49163f3a101372..4c10c5b9d9569087b9e0096d22f12eef61ef6a15 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/PreparedStatementTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/PreparedStatementTest.java
@@ -33,8 +33,10 @@ public class PreparedStatementTest extends BaseTest {
         properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
-        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/" + "?user=root&password=taosdata",
-                properties);
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_USER,"root");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_PASSWORD,"taosdata");
+
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
 
         String sql = "drop database if exists " + dbName;
         statement = (TSDBPreparedStatement) connection.prepareStatement(sql);
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ResultSetTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ResultSetTest.java
index a0b9c051c6241a32a60e4b12aa85b1f52ec42672..a556e0df76d50e8a5e9a39738452f92d63e251c1 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ResultSetTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/ResultSetTest.java
@@ -34,9 +34,11 @@ public class ResultSetTest extends BaseTest {
         properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_USER,"root");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_PASSWORD,"taosdata");
 
-        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/" + "?user=root&password=taosdata"
-                , properties);
+
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
 
         statement = connection.createStatement();
         statement.executeUpdate("drop database if exists " + dbName);
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SelectTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SelectTest.java
index de21cc6195baeb41271b198ccbd1302635c0c030..0992e407c6a83df41ef402fcc56c2e70319961a8 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SelectTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SelectTest.java
@@ -28,8 +28,10 @@ public class SelectTest extends BaseTest {
         properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
-        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/" + "?user=root&password=taosdata"
-                , properties);
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_USER,"root");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_PASSWORD,"taosdata");
+
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/" , properties);
 
         statement = connection.createStatement();
         statement.executeUpdate("drop database if exists " + dbName);
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StableTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StableTest.java
index c1321d08fc7a46fc724c81bbd44d790edbe03265..183bcc5aa835df76f3fea32f5c5aa249489f8e78 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StableTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StableTest.java
@@ -31,8 +31,10 @@ public class StableTest extends BaseTest {
         properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
-        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/" + "?user=root&password=taosdata"
-                , properties);
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_USER,"root");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_PASSWORD,"taosdata");
+
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/" , properties);
 
         statement = connection.createStatement();
         statement.executeUpdate("create database if not exists " + dbName);
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StatementTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StatementTest.java
index 4fe5c39486edfdbdf015cc0a44d7917dbdd79749..c7c54f198b93615f546407d2aeb28e83c2a5b26c 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StatementTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/StatementTest.java
@@ -30,8 +30,10 @@ public class StatementTest extends BaseTest {
         properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
-        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/" + "?user=root&password=taosdata"
-                , properties);
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_USER,"root");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_PASSWORD,"taosdata");
+
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
 
         statement = connection.createStatement();
         statement.executeUpdate("drop database if exists " + dbName);
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SubscribeTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SubscribeTest.java
index 2dc27adab72f1664b951c658209809a258b3a730..960d6fc1091e226ff71b33f400cba403b15bee28 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SubscribeTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/SubscribeTest.java
@@ -32,8 +32,10 @@ public class SubscribeTest extends BaseTest {
         properties.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
         properties.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
-        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/" + "?user=root&password=taosdata"
-                , properties);
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_USER,"root");
+        properties.setProperty(TSDBDriver.PROPERTY_KEY_PASSWORD,"taosdata");
+
+        connection = DriverManager.getConnection("jdbc:TAOS://" + host + ":0/", properties);
 
         statement = connection.createStatement();
         statement.executeUpdate("create database if not exists " + dbName);