diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestFunctionsWithTypeExpoQueries.java b/exec/java-exec/src/test/java/org/apache/drill/TestFunctionsWithTypeExpoQueries.java
index 5df71f0f1db..5d16edda1b0 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/TestFunctionsWithTypeExpoQueries.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/TestFunctionsWithTypeExpoQueries.java
@@ -476,11 +476,6 @@ public void testAvgCountStar() throws Exception {
   }
 
   @Test
-  @Ignore // This is temporarily turned off due to
-  // [1] [StarColumn] Reverse one change in CALCITE-356,
-  //     which regresses AggChecker logic, after * query in schema-less table is added.
-  // [2] [StarColumn]
-  //     When group-by a column, projecting on a star which cannot be expanded at planning time, use ITEM operator to wrap this column
   public void testUDFInGroupBy() throws Exception {
     final String query = "select count(*) as col1, substr(lower(UPPER(cast(t3.full_name as varchar(100)))), 5, 2) as col2, \n" +
         "char_length(substr(lower(UPPER(cast(t3.full_name as varchar(100)))), 5, 2)) as col3 \n" +
diff --git a/pom.xml b/pom.xml
index 4dfa682b99e..058036b6e11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1279,7 +1279,7 @@
           <dependency>
             <groupId>org.apache.calcite</groupId>
             <artifactId>calcite-core</artifactId>
-            <version>1.4.0-drill-test-r16</version>
+            <version>1.4.0-drill-r11</version>
             <exclusions>
               <exclusion>
                 <groupId>org.jgrapht</groupId>