diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index d9d16d1f57..e3e1291c47 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -489,11 +489,11 @@
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/last+last_row.py -Q 2
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/last+last_row.py -Q 3
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/last+last_row.py -Q 4
-#,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/primary_ts_base_1.py
-#,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/primary_ts_base_1.py -R
-#,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/primary_ts_base_1.py -Q 2
-#,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/primary_ts_base_1.py -Q 3
-#,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/primary_ts_base_1.py -Q 4
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/primary_ts_base_1.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/primary_ts_base_1.py -R
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/primary_ts_base_1.py -Q 2
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/primary_ts_base_1.py -Q 3
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/primary_ts_base_1.py -Q 4
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/primary_ts_base_2.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/primary_ts_base_2.py -R
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/primary_ts_base_2.py -Q 2
@@ -509,6 +509,11 @@
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/primary_ts_base_4.py -Q 2
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/primary_ts_base_4.py -Q 3
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/primary_ts_base_4.py -Q 4
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/primary_ts_base_5.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/primary_ts_base_5.py -R
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/primary_ts_base_5.py -Q 2
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/primary_ts_base_5.py -Q 3
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/primary_ts_base_5.py -Q 4
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/leastsquares.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/leastsquares.py -R
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/length.py
diff --git a/tests/system-test/2-query/primary_ts_base_1.py b/tests/system-test/2-query/primary_ts_base_1.py
index 05e42155cf..739afcb1ab 100644
--- a/tests/system-test/2-query/primary_ts_base_1.py
+++ b/tests/system-test/2-query/primary_ts_base_1.py
@@ -27,8 +27,8 @@ class TDTestCase(TDTestCase):
         self.fun_pk_twa(self.database,'derivative',',1s,0') 
         self.fun_pk_twa(self.database,'derivative',',1s,1') 
         self.fun_pk_unique(self.database,'unique','')  
-        # self.fun_pk_last_init(self.database,'last','')  
-        # self.fun_pk_last(self.database,'last','')  
+        self.fun_pk_last_init(self.database,'last','')  
+        self.fun_pk_last(self.database,'last','')  
         # self.fun_pk_last(self.database,'last_row','') 
         # self.fun_pk_first(self.database,'first','') 
         
diff --git a/tests/system-test/2-query/primary_ts_base_2.py b/tests/system-test/2-query/primary_ts_base_2.py
index e12166bf1f..7aed595c60 100644
--- a/tests/system-test/2-query/primary_ts_base_2.py
+++ b/tests/system-test/2-query/primary_ts_base_2.py
@@ -27,14 +27,14 @@ class TDTestCase(TDTestCase):
         # self.fun_pk_twa(self.database,'derivative',',1s,0') 
         # self.fun_pk_twa(self.database,'derivative',',1s,1') 
         # self.fun_pk_unique(self.database,'unique','')  
-        self.fun_pk_last_init(self.database,'last','')  
-        self.fun_pk_last(self.database,'last','')  
+        # self.fun_pk_last_init(self.database,'last','')  
+        # self.fun_pk_last(self.database,'last','')  
         self.fun_pk_last(self.database,'last_row','') 
         self.fun_pk_first(self.database,'first','') 
         
         self.query_pk_fun(self.database,'') 
         
-        # self.touying_pk_1(self.database,1) 
+        self.touying_pk_1(self.database,1) 
         # self.touying_pk_where(self.database,'') 
         # self.touying_pk_where(self.database,'tags') 
         # self.touying_pk_where(self.database,'distinct') 
diff --git a/tests/system-test/2-query/primary_ts_base_3.py b/tests/system-test/2-query/primary_ts_base_3.py
index a20d24378e..eb94deb719 100644
--- a/tests/system-test/2-query/primary_ts_base_3.py
+++ b/tests/system-test/2-query/primary_ts_base_3.py
@@ -34,7 +34,7 @@ class TDTestCase(TDTestCase):
         
         # self.query_pk_fun(self.database,'') 
         
-        self.touying_pk_1(self.database,1) 
+        # self.touying_pk_1(self.database,1) 
         self.touying_pk_where(self.database,'') 
         # self.touying_pk_where(self.database,'tags') 
         # self.touying_pk_where(self.database,'distinct') 
diff --git a/tests/system-test/2-query/primary_ts_base_4.py b/tests/system-test/2-query/primary_ts_base_4.py
index 85e825df96..7e446ff442 100644
--- a/tests/system-test/2-query/primary_ts_base_4.py
+++ b/tests/system-test/2-query/primary_ts_base_4.py
@@ -36,9 +36,9 @@ class TDTestCase(TDTestCase):
         
         # self.touying_pk_1(self.database,1) 
         # self.touying_pk_where(self.database,'') 
-        self.touying_pk_where(self.database,'tags') 
+        # self.touying_pk_where(self.database,'tags') 
         self.touying_pk_where(self.database,'distinct') 
-        self.count_pk(self.database,1) 
+        # self.count_pk(self.database,1) 
         
         endTime = time.time()
         print("total time %ds" % (endTime - startTime))
diff --git a/tests/system-test/2-query/primary_ts_base_5.py b/tests/system-test/2-query/primary_ts_base_5.py
new file mode 100644
index 0000000000..9246385157
--- /dev/null
+++ b/tests/system-test/2-query/primary_ts_base_5.py
@@ -0,0 +1,52 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+from util.cases import tdCases
+from .primary_ts_base import *
+from faker import Faker
+import random
+
+class TDTestCase(TDTestCase):
+                            
+    def run(self):
+        startTime = time.time() 
+        self.dropandcreateDB_primary_key(self.database, 1 , 1 ,'yes','yes','no')
+
+        # self.fun_pk_interp(self.database,'interp','') 
+        # self.multiple_agg_groupby(self.database,1) 
+        # self.fun_pk_diff(self.database,'diff','') 
+        # self.fun_pk_twa(self.database,'derivative',',1s,0') 
+        # self.fun_pk_twa(self.database,'derivative',',1s,1') 
+        # self.fun_pk_unique(self.database,'unique','')  
+        # self.fun_pk_last_init(self.database,'last','')  
+        # self.fun_pk_last(self.database,'last','')  
+        # self.fun_pk_last(self.database,'last_row','') 
+        # self.fun_pk_first(self.database,'first','') 
+        
+        # self.query_pk_fun(self.database,'') 
+        
+        # self.touying_pk_1(self.database,1) 
+        # self.touying_pk_where(self.database,'') 
+        self.touying_pk_where(self.database,'tags') 
+        # self.touying_pk_where(self.database,'distinct') 
+        self.count_pk(self.database,1) 
+        
+        endTime = time.time()
+        print("total time %ds" % (endTime - startTime))
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())