diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppBatchPointLookupExecutionTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppSinglePointLookupExecutionTest.java
similarity index 87%
rename from asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppBatchPointLookupExecutionTest.java
rename to asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppSinglePointLookupExecutionTest.java
index 2608447..2653426 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppBatchPointLookupExecutionTest.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/SqlppSinglePointLookupExecutionTest.java
@@ -36,11 +36,11 @@
 import org.junit.runners.Parameterized.Parameters;
 
 /**
- * Runs the SQL++ with Batched point-lookups enabled.
+ * Runs the SQL++ with Batched point-lookups disabled.
  */
 @RunWith(Parameterized.class)
-public class SqlppBatchPointLookupExecutionTest {
-    protected static final String TEST_CONFIG_FILE_NAME = "src/test/resources/cc-batch-lookup.conf";
+public class SqlppSinglePointLookupExecutionTest {
+    protected static final String TEST_CONFIG_FILE_NAME = "src/test/resources/cc-single-lookup.conf";
 
     @BeforeClass
     public static void setUp() throws Exception {
@@ -54,14 +54,14 @@
         LangExecutionUtil.tearDown();
     }
 
-    @Parameters(name = "SqlppBatchPointLookupExecutionTest {index}: {0}")
+    @Parameters(name = "SqlppSinglePointLookupExecutionTest {index}: {0}")
     public static Collection<Object[]> tests() throws Exception {
-        return LangExecutionUtil.tests("only_batch_lookup.xml", "testsuite_sqlpp_batch_lookup.xml");
+        return LangExecutionUtil.tests("only_single_lookup.xml", "testsuite_sqlpp_single_lookup.xml");
     }
 
     protected TestCaseContext tcCtx;
 
-    public SqlppBatchPointLookupExecutionTest(TestCaseContext tcCtx) {
+    public SqlppSinglePointLookupExecutionTest(TestCaseContext tcCtx) {
         this.tcCtx = tcCtx;
     }
 
diff --git a/asterixdb/asterix-app/src/test/resources/cc-batch-lookup.conf b/asterixdb/asterix-app/src/test/resources/cc-single-lookup.conf
similarity index 98%
rename from asterixdb/asterix-app/src/test/resources/cc-batch-lookup.conf
rename to asterixdb/asterix-app/src/test/resources/cc-single-lookup.conf
index 6e10481..68d4547 100644
--- a/asterixdb/asterix-app/src/test/resources/cc-batch-lookup.conf
+++ b/asterixdb/asterix-app/src/test/resources/cc-single-lookup.conf
@@ -59,7 +59,7 @@
 compiler.joinmemory=256KB
 compiler.textsearchmemory=160KB
 compiler.windowmemory=192KB
-compiler.batch.lookup=true
+compiler.batch.lookup=false
 messaging.frame.size=4096
 messaging.frame.count=512
 
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/only_batch_lookup.xml b/asterixdb/asterix-app/src/test/resources/runtimets/only_single_lookup.xml
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/only_batch_lookup.xml
rename to asterixdb/asterix-app/src/test/resources/runtimets/only_single_lookup.xml
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.regexadm
index 4e6a68e..0d42b1b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.regexadm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1/cluster_state_1.1.regexadm
@@ -10,7 +10,7 @@
     "active\.suspend\.timeout" : 3600,
     "azure.request.timeout" : 120,
     "compiler\.arrayindex" : true,
-    "compiler.batch.lookup" : false,
+    "compiler.batch.lookup" : true,
     "compiler.cbo" : false,
     "compiler.column.filter" : false,
     "compiler\.external\.field\.pushdown" : true,
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.regexadm
index d025d7a..6a123e1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.regexadm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_full/cluster_state_1_full.1.regexadm
@@ -10,7 +10,7 @@
     "active\.suspend\.timeout" : 3600,
     "azure.request.timeout" : 120,
     "compiler\.arrayindex" : true,
-    "compiler.batch.lookup" : false,
+    "compiler.batch.lookup" : true,
     "compiler.cbo" : false,
     "compiler.column.filter" : false,
     "compiler\.external\.field\.pushdown" : true,
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.regexadm b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.regexadm
index 7f2dcb1..d72d8bc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.regexadm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cluster_state_1_less/cluster_state_1_less.1.regexadm
@@ -10,7 +10,7 @@
     "active\.suspend\.timeout" : 3600,
     "azure.request.timeout" : 120,
     "compiler\.arrayindex" : true,
-    "compiler.batch.lookup" : false,
+    "compiler.batch.lookup" : true,
     "compiler.cbo" : false,
     "compiler.column.filter" : false,
     "compiler\.external\.field\.pushdown" : true,
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_batch_lookup.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_single_lookup.xml
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_batch_lookup.xml
rename to asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_single_lookup.xml
diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/config/AlgebricksConfig.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/config/AlgebricksConfig.java
index 0d02203..74f4447 100644
--- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/config/AlgebricksConfig.java
+++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/config/AlgebricksConfig.java
@@ -44,6 +44,6 @@
     public static final String QUERY_PLAN_SHAPE_DEFAULT = QUERY_PLAN_SHAPE_ZIGZAG;
     public static final int EXTERNAL_SCAN_BUFFER_SIZE =
             StorageUtil.getIntSizeInBytes(8, StorageUtil.StorageUnit.KILOBYTE);
-    public static final boolean BATCH_LOOKUP_DEFAULT = false;
+    public static final boolean BATCH_LOOKUP_DEFAULT = true;
     public static final boolean COLUMN_FILTER_DEFAULT = false;
 }