diff --git a/tests/include/pgsql_common.sh b/tests/include/pgsql_common.sh
index bcb4b6e..cae10b5 100644
--- a/tests/include/pgsql_common.sh
+++ b/tests/include/pgsql_common.sh
@@ -56,6 +56,7 @@ EOF
 FROM pg_catalog.pg_indexes
 WHERE schemaname = 'public'
     AND tablename = '$1'
+ORDER BY 1
 EOF
 }
 
diff --git a/tests/t/script_oltp_delete_pgsql.t b/tests/t/script_oltp_delete_pgsql.t
index ddd71c4..09cb8be 100644
--- a/tests/t/script_oltp_delete_pgsql.t
+++ b/tests/t/script_oltp_delete_pgsql.t
@@ -40,8 +40,8 @@ oltp_delete.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id)
    CREATE INDEX k_1 ON sbtest1 USING btree (k)
+   CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id)
   
                               Table "public.sbtest2"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -52,8 +52,8 @@ oltp_delete.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest2_pkey ON sbtest2 USING btree (id)
    CREATE INDEX k_2 ON sbtest2 USING btree (k)
+   CREATE UNIQUE INDEX sbtest2_pkey ON sbtest2 USING btree (id)
   
                               Table "public.sbtest3"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -64,8 +64,8 @@ oltp_delete.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest3_pkey ON sbtest3 USING btree (id)
    CREATE INDEX k_3 ON sbtest3 USING btree (k)
+   CREATE UNIQUE INDEX sbtest3_pkey ON sbtest3 USING btree (id)
   
                               Table "public.sbtest4"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -76,8 +76,8 @@ oltp_delete.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest4_pkey ON sbtest4 USING btree (id)
    CREATE INDEX k_4 ON sbtest4 USING btree (k)
+   CREATE UNIQUE INDEX sbtest4_pkey ON sbtest4 USING btree (id)
   
                               Table "public.sbtest5"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -88,8 +88,8 @@ oltp_delete.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest5_pkey ON sbtest5 USING btree (id)
    CREATE INDEX k_5 ON sbtest5 USING btree (k)
+   CREATE UNIQUE INDEX sbtest5_pkey ON sbtest5 USING btree (id)
   
                               Table "public.sbtest6"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -100,8 +100,8 @@ oltp_delete.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest6_pkey ON sbtest6 USING btree (id)
    CREATE INDEX k_6 ON sbtest6 USING btree (k)
+   CREATE UNIQUE INDEX sbtest6_pkey ON sbtest6 USING btree (id)
   
                               Table "public.sbtest7"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -112,8 +112,8 @@ oltp_delete.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest7_pkey ON sbtest7 USING btree (id)
    CREATE INDEX k_7 ON sbtest7 USING btree (k)
+   CREATE UNIQUE INDEX sbtest7_pkey ON sbtest7 USING btree (id)
   
                               Table "public.sbtest8"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -124,8 +124,8 @@ oltp_delete.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest8_pkey ON sbtest8 USING btree (id)
    CREATE INDEX k_8 ON sbtest8 USING btree (k)
+   CREATE UNIQUE INDEX sbtest8_pkey ON sbtest8 USING btree (id)
   
   Did not find any relation named "sbtest9".
   sysbench *.* * (glob)
@@ -150,8 +150,8 @@ oltp_delete.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id)
    CREATE INDEX k_1 ON sbtest1 USING btree (k)
+   CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id)
   
                               Table "public.sbtest2"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -162,8 +162,8 @@ oltp_delete.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest2_pkey ON sbtest2 USING btree (id)
    CREATE INDEX k_2 ON sbtest2 USING btree (k)
+   CREATE UNIQUE INDEX sbtest2_pkey ON sbtest2 USING btree (id)
   
                               Table "public.sbtest3"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -174,8 +174,8 @@ oltp_delete.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest3_pkey ON sbtest3 USING btree (id)
    CREATE INDEX k_3 ON sbtest3 USING btree (k)
+   CREATE UNIQUE INDEX sbtest3_pkey ON sbtest3 USING btree (id)
   
                               Table "public.sbtest4"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -186,8 +186,8 @@ oltp_delete.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest4_pkey ON sbtest4 USING btree (id)
    CREATE INDEX k_4 ON sbtest4 USING btree (k)
+   CREATE UNIQUE INDEX sbtest4_pkey ON sbtest4 USING btree (id)
   
                               Table "public.sbtest5"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -198,8 +198,8 @@ oltp_delete.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest5_pkey ON sbtest5 USING btree (id)
    CREATE INDEX k_5 ON sbtest5 USING btree (k)
+   CREATE UNIQUE INDEX sbtest5_pkey ON sbtest5 USING btree (id)
   
                               Table "public.sbtest6"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -210,8 +210,8 @@ oltp_delete.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest6_pkey ON sbtest6 USING btree (id)
    CREATE INDEX k_6 ON sbtest6 USING btree (k)
+   CREATE UNIQUE INDEX sbtest6_pkey ON sbtest6 USING btree (id)
   
                               Table "public.sbtest7"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -222,8 +222,8 @@ oltp_delete.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest7_pkey ON sbtest7 USING btree (id)
    CREATE INDEX k_7 ON sbtest7 USING btree (k)
+   CREATE UNIQUE INDEX sbtest7_pkey ON sbtest7 USING btree (id)
   
                               Table "public.sbtest8"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -234,8 +234,8 @@ oltp_delete.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest8_pkey ON sbtest8 USING btree (id)
    CREATE INDEX k_8 ON sbtest8 USING btree (k)
+   CREATE UNIQUE INDEX sbtest8_pkey ON sbtest8 USING btree (id)
   
   Did not find any relation named "sbtest9".
   sysbench *.* * (glob)
diff --git a/tests/t/script_oltp_insert_pgsql.t b/tests/t/script_oltp_insert_pgsql.t
index 1588563..ed8c44a 100644
--- a/tests/t/script_oltp_insert_pgsql.t
+++ b/tests/t/script_oltp_insert_pgsql.t
@@ -40,8 +40,8 @@ oltp_insert.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id)
    CREATE INDEX k_1 ON sbtest1 USING btree (k)
+   CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id)
   
                               Table "public.sbtest2"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -52,8 +52,8 @@ oltp_insert.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest2_pkey ON sbtest2 USING btree (id)
    CREATE INDEX k_2 ON sbtest2 USING btree (k)
+   CREATE UNIQUE INDEX sbtest2_pkey ON sbtest2 USING btree (id)
   
                               Table "public.sbtest3"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -64,8 +64,8 @@ oltp_insert.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest3_pkey ON sbtest3 USING btree (id)
    CREATE INDEX k_3 ON sbtest3 USING btree (k)
+   CREATE UNIQUE INDEX sbtest3_pkey ON sbtest3 USING btree (id)
   
                               Table "public.sbtest4"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -76,8 +76,8 @@ oltp_insert.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest4_pkey ON sbtest4 USING btree (id)
    CREATE INDEX k_4 ON sbtest4 USING btree (k)
+   CREATE UNIQUE INDEX sbtest4_pkey ON sbtest4 USING btree (id)
   
                               Table "public.sbtest5"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -88,8 +88,8 @@ oltp_insert.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest5_pkey ON sbtest5 USING btree (id)
    CREATE INDEX k_5 ON sbtest5 USING btree (k)
+   CREATE UNIQUE INDEX sbtest5_pkey ON sbtest5 USING btree (id)
   
                               Table "public.sbtest6"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -100,8 +100,8 @@ oltp_insert.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest6_pkey ON sbtest6 USING btree (id)
    CREATE INDEX k_6 ON sbtest6 USING btree (k)
+   CREATE UNIQUE INDEX sbtest6_pkey ON sbtest6 USING btree (id)
   
                               Table "public.sbtest7"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -112,8 +112,8 @@ oltp_insert.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest7_pkey ON sbtest7 USING btree (id)
    CREATE INDEX k_7 ON sbtest7 USING btree (k)
+   CREATE UNIQUE INDEX sbtest7_pkey ON sbtest7 USING btree (id)
   
                               Table "public.sbtest8"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -124,8 +124,8 @@ oltp_insert.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest8_pkey ON sbtest8 USING btree (id)
    CREATE INDEX k_8 ON sbtest8 USING btree (k)
+   CREATE UNIQUE INDEX sbtest8_pkey ON sbtest8 USING btree (id)
   
   Did not find any relation named "sbtest9".
   sysbench *.* * (glob)
@@ -150,8 +150,8 @@ oltp_insert.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id)
    CREATE INDEX k_1 ON sbtest1 USING btree (k)
+   CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id)
   
                               Table "public.sbtest2"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -162,8 +162,8 @@ oltp_insert.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest2_pkey ON sbtest2 USING btree (id)
    CREATE INDEX k_2 ON sbtest2 USING btree (k)
+   CREATE UNIQUE INDEX sbtest2_pkey ON sbtest2 USING btree (id)
   
                               Table "public.sbtest3"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -174,8 +174,8 @@ oltp_insert.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest3_pkey ON sbtest3 USING btree (id)
    CREATE INDEX k_3 ON sbtest3 USING btree (k)
+   CREATE UNIQUE INDEX sbtest3_pkey ON sbtest3 USING btree (id)
   
                               Table "public.sbtest4"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -186,8 +186,8 @@ oltp_insert.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest4_pkey ON sbtest4 USING btree (id)
    CREATE INDEX k_4 ON sbtest4 USING btree (k)
+   CREATE UNIQUE INDEX sbtest4_pkey ON sbtest4 USING btree (id)
   
                               Table "public.sbtest5"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -198,8 +198,8 @@ oltp_insert.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest5_pkey ON sbtest5 USING btree (id)
    CREATE INDEX k_5 ON sbtest5 USING btree (k)
+   CREATE UNIQUE INDEX sbtest5_pkey ON sbtest5 USING btree (id)
   
                               Table "public.sbtest6"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -210,8 +210,8 @@ oltp_insert.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest6_pkey ON sbtest6 USING btree (id)
    CREATE INDEX k_6 ON sbtest6 USING btree (k)
+   CREATE UNIQUE INDEX sbtest6_pkey ON sbtest6 USING btree (id)
   
                               Table "public.sbtest7"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -222,8 +222,8 @@ oltp_insert.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest7_pkey ON sbtest7 USING btree (id)
    CREATE INDEX k_7 ON sbtest7 USING btree (k)
+   CREATE UNIQUE INDEX sbtest7_pkey ON sbtest7 USING btree (id)
   
                               Table "public.sbtest8"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -234,8 +234,8 @@ oltp_insert.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest8_pkey ON sbtest8 USING btree (id)
    CREATE INDEX k_8 ON sbtest8 USING btree (k)
+   CREATE UNIQUE INDEX sbtest8_pkey ON sbtest8 USING btree (id)
   
   Did not find any relation named "sbtest9".
   sysbench *.* * (glob)
diff --git a/tests/t/script_oltp_point_select_pgsql.t b/tests/t/script_oltp_point_select_pgsql.t
index a8ae0c5..bab86da 100644
--- a/tests/t/script_oltp_point_select_pgsql.t
+++ b/tests/t/script_oltp_point_select_pgsql.t
@@ -40,8 +40,8 @@ oltp_point_select.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id)
    CREATE INDEX k_1 ON sbtest1 USING btree (k)
+   CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id)
   
                               Table "public.sbtest2"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -52,8 +52,8 @@ oltp_point_select.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest2_pkey ON sbtest2 USING btree (id)
    CREATE INDEX k_2 ON sbtest2 USING btree (k)
+   CREATE UNIQUE INDEX sbtest2_pkey ON sbtest2 USING btree (id)
   
                               Table "public.sbtest3"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -64,8 +64,8 @@ oltp_point_select.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest3_pkey ON sbtest3 USING btree (id)
    CREATE INDEX k_3 ON sbtest3 USING btree (k)
+   CREATE UNIQUE INDEX sbtest3_pkey ON sbtest3 USING btree (id)
   
                               Table "public.sbtest4"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -76,8 +76,8 @@ oltp_point_select.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest4_pkey ON sbtest4 USING btree (id)
    CREATE INDEX k_4 ON sbtest4 USING btree (k)
+   CREATE UNIQUE INDEX sbtest4_pkey ON sbtest4 USING btree (id)
   
                               Table "public.sbtest5"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -88,8 +88,8 @@ oltp_point_select.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest5_pkey ON sbtest5 USING btree (id)
    CREATE INDEX k_5 ON sbtest5 USING btree (k)
+   CREATE UNIQUE INDEX sbtest5_pkey ON sbtest5 USING btree (id)
   
                               Table "public.sbtest6"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -100,8 +100,8 @@ oltp_point_select.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest6_pkey ON sbtest6 USING btree (id)
    CREATE INDEX k_6 ON sbtest6 USING btree (k)
+   CREATE UNIQUE INDEX sbtest6_pkey ON sbtest6 USING btree (id)
   
                               Table "public.sbtest7"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -112,8 +112,8 @@ oltp_point_select.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest7_pkey ON sbtest7 USING btree (id)
    CREATE INDEX k_7 ON sbtest7 USING btree (k)
+   CREATE UNIQUE INDEX sbtest7_pkey ON sbtest7 USING btree (id)
   
                               Table "public.sbtest8"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -124,8 +124,8 @@ oltp_point_select.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest8_pkey ON sbtest8 USING btree (id)
    CREATE INDEX k_8 ON sbtest8 USING btree (k)
+   CREATE UNIQUE INDEX sbtest8_pkey ON sbtest8 USING btree (id)
   
   Did not find any relation named "sbtest9".
   sysbench *.* * (glob)
@@ -150,8 +150,8 @@ oltp_point_select.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id)
    CREATE INDEX k_1 ON sbtest1 USING btree (k)
+   CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id)
   
                               Table "public.sbtest2"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -162,8 +162,8 @@ oltp_point_select.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest2_pkey ON sbtest2 USING btree (id)
    CREATE INDEX k_2 ON sbtest2 USING btree (k)
+   CREATE UNIQUE INDEX sbtest2_pkey ON sbtest2 USING btree (id)
   
                               Table "public.sbtest3"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -174,8 +174,8 @@ oltp_point_select.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest3_pkey ON sbtest3 USING btree (id)
    CREATE INDEX k_3 ON sbtest3 USING btree (k)
+   CREATE UNIQUE INDEX sbtest3_pkey ON sbtest3 USING btree (id)
   
                               Table "public.sbtest4"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -186,8 +186,8 @@ oltp_point_select.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest4_pkey ON sbtest4 USING btree (id)
    CREATE INDEX k_4 ON sbtest4 USING btree (k)
+   CREATE UNIQUE INDEX sbtest4_pkey ON sbtest4 USING btree (id)
   
                               Table "public.sbtest5"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -198,8 +198,8 @@ oltp_point_select.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest5_pkey ON sbtest5 USING btree (id)
    CREATE INDEX k_5 ON sbtest5 USING btree (k)
+   CREATE UNIQUE INDEX sbtest5_pkey ON sbtest5 USING btree (id)
   
                               Table "public.sbtest6"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -210,8 +210,8 @@ oltp_point_select.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest6_pkey ON sbtest6 USING btree (id)
    CREATE INDEX k_6 ON sbtest6 USING btree (k)
+   CREATE UNIQUE INDEX sbtest6_pkey ON sbtest6 USING btree (id)
   
                               Table "public.sbtest7"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -222,8 +222,8 @@ oltp_point_select.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest7_pkey ON sbtest7 USING btree (id)
    CREATE INDEX k_7 ON sbtest7 USING btree (k)
+   CREATE UNIQUE INDEX sbtest7_pkey ON sbtest7 USING btree (id)
   
                               Table "public.sbtest8"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -234,8 +234,8 @@ oltp_point_select.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest8_pkey ON sbtest8 USING btree (id)
    CREATE INDEX k_8 ON sbtest8 USING btree (k)
+   CREATE UNIQUE INDEX sbtest8_pkey ON sbtest8 USING btree (id)
   
   Did not find any relation named "sbtest9".
   sysbench *.* * (glob)
diff --git a/tests/t/script_oltp_read_write_pgsql.t b/tests/t/script_oltp_read_write_pgsql.t
index 80e119c..5eb9d26 100644
--- a/tests/t/script_oltp_read_write_pgsql.t
+++ b/tests/t/script_oltp_read_write_pgsql.t
@@ -43,8 +43,8 @@ oltp_read_write.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id)
    CREATE INDEX k_1 ON sbtest1 USING btree (k)
+   CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id)
   
                               Table "public.sbtest2"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -55,8 +55,8 @@ oltp_read_write.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest2_pkey ON sbtest2 USING btree (id)
    CREATE INDEX k_2 ON sbtest2 USING btree (k)
+   CREATE UNIQUE INDEX sbtest2_pkey ON sbtest2 USING btree (id)
   
                               Table "public.sbtest3"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -67,8 +67,8 @@ oltp_read_write.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest3_pkey ON sbtest3 USING btree (id)
    CREATE INDEX k_3 ON sbtest3 USING btree (k)
+   CREATE UNIQUE INDEX sbtest3_pkey ON sbtest3 USING btree (id)
   
                               Table "public.sbtest4"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -79,8 +79,8 @@ oltp_read_write.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest4_pkey ON sbtest4 USING btree (id)
    CREATE INDEX k_4 ON sbtest4 USING btree (k)
+   CREATE UNIQUE INDEX sbtest4_pkey ON sbtest4 USING btree (id)
   
                               Table "public.sbtest5"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -91,8 +91,8 @@ oltp_read_write.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest5_pkey ON sbtest5 USING btree (id)
    CREATE INDEX k_5 ON sbtest5 USING btree (k)
+   CREATE UNIQUE INDEX sbtest5_pkey ON sbtest5 USING btree (id)
   
                               Table "public.sbtest6"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -103,8 +103,8 @@ oltp_read_write.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest6_pkey ON sbtest6 USING btree (id)
    CREATE INDEX k_6 ON sbtest6 USING btree (k)
+   CREATE UNIQUE INDEX sbtest6_pkey ON sbtest6 USING btree (id)
   
                               Table "public.sbtest7"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -115,8 +115,8 @@ oltp_read_write.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest7_pkey ON sbtest7 USING btree (id)
    CREATE INDEX k_7 ON sbtest7 USING btree (k)
+   CREATE UNIQUE INDEX sbtest7_pkey ON sbtest7 USING btree (id)
   
                               Table "public.sbtest8"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -127,8 +127,8 @@ oltp_read_write.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest8_pkey ON sbtest8 USING btree (id)
    CREATE INDEX k_8 ON sbtest8 USING btree (k)
+   CREATE UNIQUE INDEX sbtest8_pkey ON sbtest8 USING btree (id)
   
   Did not find any relation named "sbtest9".
   sysbench *.* * (glob)
@@ -153,8 +153,8 @@ oltp_read_write.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id)
    CREATE INDEX k_1 ON sbtest1 USING btree (k)
+   CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id)
   
                               Table "public.sbtest2"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -165,8 +165,8 @@ oltp_read_write.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest2_pkey ON sbtest2 USING btree (id)
    CREATE INDEX k_2 ON sbtest2 USING btree (k)
+   CREATE UNIQUE INDEX sbtest2_pkey ON sbtest2 USING btree (id)
   
                               Table "public.sbtest3"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -177,8 +177,8 @@ oltp_read_write.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest3_pkey ON sbtest3 USING btree (id)
    CREATE INDEX k_3 ON sbtest3 USING btree (k)
+   CREATE UNIQUE INDEX sbtest3_pkey ON sbtest3 USING btree (id)
   
                               Table "public.sbtest4"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -189,8 +189,8 @@ oltp_read_write.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest4_pkey ON sbtest4 USING btree (id)
    CREATE INDEX k_4 ON sbtest4 USING btree (k)
+   CREATE UNIQUE INDEX sbtest4_pkey ON sbtest4 USING btree (id)
   
                               Table "public.sbtest5"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -201,8 +201,8 @@ oltp_read_write.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest5_pkey ON sbtest5 USING btree (id)
    CREATE INDEX k_5 ON sbtest5 USING btree (k)
+   CREATE UNIQUE INDEX sbtest5_pkey ON sbtest5 USING btree (id)
   
                               Table "public.sbtest6"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -213,8 +213,8 @@ oltp_read_write.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest6_pkey ON sbtest6 USING btree (id)
    CREATE INDEX k_6 ON sbtest6 USING btree (k)
+   CREATE UNIQUE INDEX sbtest6_pkey ON sbtest6 USING btree (id)
   
                               Table "public.sbtest7"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -225,8 +225,8 @@ oltp_read_write.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest7_pkey ON sbtest7 USING btree (id)
    CREATE INDEX k_7 ON sbtest7 USING btree (k)
+   CREATE UNIQUE INDEX sbtest7_pkey ON sbtest7 USING btree (id)
   
                               Table "public.sbtest8"
    Column |      Type      |                      Modifiers                       | Storage  | Stats target | Description 
@@ -237,8 +237,8 @@ oltp_read_write.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest8_pkey ON sbtest8 USING btree (id)
    CREATE INDEX k_8 ON sbtest8 USING btree (k)
+   CREATE UNIQUE INDEX sbtest8_pkey ON sbtest8 USING btree (id)
   
   Did not find any relation named "sbtest9".
   sysbench *.* * (glob)
diff --git a/tests/t/script_select_random_pgsql.t b/tests/t/script_select_random_pgsql.t
index 3993881..4821406 100644
--- a/tests/t/script_select_random_pgsql.t
+++ b/tests/t/script_select_random_pgsql.t
@@ -18,8 +18,8 @@ select_random_*.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id)
    CREATE INDEX k_1 ON sbtest1 USING btree (k)
+   CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id)
   
   Did not find any relation named "sbtest2".
   Did not find any relation named "sbtest3".
@@ -90,8 +90,8 @@ select_random_*.lua + PostgreSQL tests
    pad    | character(60)  | not null default ''::bpchar                          | extended |              | 
   
   Indexes:
-   CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id)
    CREATE INDEX k_1 ON sbtest1 USING btree (k)
+   CREATE UNIQUE INDEX sbtest1_pkey ON sbtest1 USING btree (id)
   
   Did not find any relation named "sbtest2".
   Did not find any relation named "sbtest3".