diff --git a/halo2_proofs/tests/plonk_api.rs b/halo2_proofs/tests/plonk_api.rs
index 307dbdfef0..274daffa91 100644
--- a/halo2_proofs/tests/plonk_api.rs
+++ b/halo2_proofs/tests/plonk_api.rs
@@ -649,7 +649,7 @@ fn plonk_api() {
                                     ),
                                 },
                                 Fixed {
-                                    query_index: 2,
+                                    query_index: 0,
                                     column_index: 2,
                                     rotation: Rotation(
                                         0,
@@ -665,7 +665,7 @@ fn plonk_api() {
                                     ),
                                 },
                                 Fixed {
-                                    query_index: 3,
+                                    query_index: 1,
                                     column_index: 3,
                                     rotation: Rotation(
                                         0,
@@ -691,7 +691,7 @@ fn plonk_api() {
                                 },
                             ),
                             Fixed {
-                                query_index: 5,
+                                query_index: 2,
                                 column_index: 1,
                                 rotation: Rotation(
                                     0,
@@ -709,7 +709,7 @@ fn plonk_api() {
                                 ),
                             },
                             Fixed {
-                                query_index: 4,
+                                query_index: 3,
                                 column_index: 4,
                                 rotation: Rotation(
                                     0,
@@ -720,7 +720,7 @@ fn plonk_api() {
                 ),
                 Product(
                     Fixed {
-                        query_index: 1,
+                        query_index: 4,
                         column_index: 0,
                         rotation: Rotation(
                             0,
@@ -746,7 +746,7 @@ fn plonk_api() {
             ),
             Product(
                 Fixed {
-                    query_index: 6,
+                    query_index: 5,
                     column_index: 5,
                     rotation: Rotation(
                         0,
@@ -851,7 +851,7 @@ fn plonk_api() {
         fixed_queries: [
             (
                 Column {
-                    index: 6,
+                    index: 2,
                     column_type: Fixed,
                 },
                 Rotation(
@@ -860,7 +860,7 @@ fn plonk_api() {
             ),
             (
                 Column {
-                    index: 0,
+                    index: 3,
                     column_type: Fixed,
                 },
                 Rotation(
@@ -869,7 +869,7 @@ fn plonk_api() {
             ),
             (
                 Column {
-                    index: 2,
+                    index: 1,
                     column_type: Fixed,
                 },
                 Rotation(
@@ -878,7 +878,7 @@ fn plonk_api() {
             ),
             (
                 Column {
-                    index: 3,
+                    index: 4,
                     column_type: Fixed,
                 },
                 Rotation(
@@ -887,7 +887,7 @@ fn plonk_api() {
             ),
             (
                 Column {
-                    index: 4,
+                    index: 0,
                     column_type: Fixed,
                 },
                 Rotation(
@@ -896,7 +896,7 @@ fn plonk_api() {
             ),
             (
                 Column {
-                    index: 1,
+                    index: 5,
                     column_type: Fixed,
                 },
                 Rotation(
@@ -905,7 +905,7 @@ fn plonk_api() {
             ),
             (
                 Column {
-                    index: 5,
+                    index: 6,
                     column_type: Fixed,
                 },
                 Rotation(
@@ -978,7 +978,7 @@ fn plonk_api() {
                 ],
                 table_expressions: [
                     Fixed {
-                        query_index: 0,
+                        query_index: 6,
                         column_index: 6,
                         rotation: Rotation(
                             0,