diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-01.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-01.aql
similarity index 100%
rename from asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-01.aql
rename to asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-01.aql
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-02.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-02.aql
similarity index 100%
rename from asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-02.aql
rename to asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-02.aql
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-03.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-03.aql
similarity index 100%
rename from asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-03.aql
rename to asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-03.aql
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-04.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-04.aql
similarity index 100%
rename from asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-04.aql
rename to asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-04.aql
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-05.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-05.aql
similarity index 100%
rename from asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-05.aql
rename to asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-05.aql
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-06.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-06.aql
similarity index 100%
rename from asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-06.aql
rename to asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-06.aql
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-07.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-07.aql
similarity index 100%
rename from asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-07.aql
rename to asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-07.aql
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-08.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-08.aql
similarity index 100%
rename from asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-08.aql
rename to asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-08.aql
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-11.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-11.aql
similarity index 100%
rename from asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-11.aql
rename to asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-11.aql
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-22.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-22.aql
similarity index 100%
rename from asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-22.aql
rename to asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-22.aql
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-33.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-33.aql
similarity index 100%
rename from asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-33.aql
rename to asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-33.aql
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-44.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-44.aql
similarity index 100%
rename from asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-44.aql
rename to asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-44.aql
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-55.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-55.aql
similarity index 100%
rename from asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-55.aql
rename to asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-55.aql
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-66.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-66.aql
similarity index 100%
rename from asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-66.aql
rename to asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-66.aql
diff --git a/asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-88.aql b/asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-88.aql
similarity index 100%
rename from asterix-app/src/test/resources/optimizerts/queries/btree-index/indexnl-88.aql
rename to asterix-app/src/test/resources/optimizerts/queries/btree-index-join/indexnl-88.aql