diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/TestWindowFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/TestWindowFunctions.java
index 24c1f4c..8676c28 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/exec/TestWindowFunctions.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/exec/TestWindowFunctions.java
@@ -392,4 +392,15 @@
         .go();
   }
 
+  @Test // DRILL-3404
+  public void testWindowSumAggIsNotNull() throws Exception {
+    String query = String.format("select count(*) cnt from (select sum ( c1 ) over ( partition by c2 order by c1 asc nulls first ) w_sum from dfs.`%s/window/table_with_nulls.parquet` ) sub_query where w_sum is not null", TEST_RES_PATH);
+    testBuilder()
+      .sqlQuery(query)
+      .ordered()
+      .baselineColumns("cnt")
+      .baselineValues(26l)
+      .build().run();
+  }
+
 }
diff --git a/exec/java-exec/src/test/resources/window/table_with_nulls.parquet b/exec/java-exec/src/test/resources/window/table_with_nulls.parquet
new file mode 100644
index 0000000..1bed27d
--- /dev/null
+++ b/exec/java-exec/src/test/resources/window/table_with_nulls.parquet
Binary files differ
diff --git a/pom.xml b/pom.xml
index 9d40d09..7d93e3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1226,7 +1226,7 @@
           <dependency>
             <groupId>org.apache.calcite</groupId>
             <artifactId>calcite-core</artifactId>
-            <version>1.1.0-drill-r13</version>
+            <version>1.1.0-drill-r14</version>
             <exclusions>
               <exclusion>
                 <groupId>org.jgrapht</groupId>