diff --git a/samples/src/main/java/com/example/bigquery/CreatePartitionedTable.java b/samples/src/main/java/com/example/bigquery/CreatePartitionedTable.java
index 21dcdbf13..79a15a801 100644
--- a/samples/src/main/java/com/example/bigquery/CreatePartitionedTable.java
+++ b/samples/src/main/java/com/example/bigquery/CreatePartitionedTable.java
@@ -50,8 +50,8 @@ public static void createPartitionedTable(String datasetName, String tableName)
       Schema schema =
           Schema.of(
               Field.of("stringField", StandardSQLTypeName.STRING),
-              Field.of("booleanField", StandardSQLTypeName.BOOL));
-      Field.of("dateField", StandardSQLTypeName.DATE);
+              Field.of("booleanField", StandardSQLTypeName.BOOL),
+              Field.of("dateField", StandardSQLTypeName.DATE));
 
       StandardTableDefinition tableDefinition =
           StandardTableDefinition.newBuilder()
diff --git a/samples/src/main/java/com/example/bigquery/QueryClusteredTable.java b/samples/src/main/java/com/example/bigquery/QueryClusteredTable.java
new file mode 100644
index 000000000..f02a56360
--- /dev/null
+++ b/samples/src/main/java/com/example/bigquery/QueryClusteredTable.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.bigquery;
+
+// [START bigquery_query_clustered_table]
+import com.google.cloud.bigquery.BigQuery;
+import com.google.cloud.bigquery.BigQueryException;
+import com.google.cloud.bigquery.BigQueryOptions;
+import com.google.cloud.bigquery.QueryJobConfiguration;
+import com.google.cloud.bigquery.TableResult;
+
+public class QueryClusteredTable {
+
+  public static void runQueryClusteredTable() throws Exception {
+    // TODO(developer): Replace these variables before running the sample.
+    String projectId = "MY_PROJECT_ID";
+    String datasetName = "MY_DATASET_NAME";
+    String tableName = "MY_TABLE_NAME";
+    queryClusteredTable(projectId, datasetName, tableName);
+  }
+
+  public static void queryClusteredTable(String projectId, String datasetName, String tableName) {
+    try {
+      // Initialize client that will be used to send requests. This client only needs to be created
+      // once, and can be reused for multiple requests.
+      BigQuery bigquery = BigQueryOptions.getDefaultInstance().getService();
+
+      String sourceTable = "`" + projectId + "." + datasetName + "." + tableName + "`";
+      String query =
+          "SELECT word, word_count\n"
+              + "FROM "
+              + sourceTable
+              + "\n"
+              // Optimize query performance by filtering the clustered columns in sort order
+              + "WHERE corpus = 'romeoandjuliet'\n"
+              + "AND word_count >= 1";
+
+      QueryJobConfiguration queryConfig = QueryJobConfiguration.newBuilder(query).build();
+
+      TableResult results = bigquery.query(queryConfig);
+
+      results
+          .iterateAll()
+          .forEach(row -> row.forEach(val -> System.out.printf("%s,", val.toString())));
+
+      System.out.println("Query clustered table performed successfully.");
+    } catch (BigQueryException | InterruptedException e) {
+      System.out.println("Query not performed \n" + e.toString());
+    }
+  }
+}
+// [END bigquery_query_clustered_table]
diff --git a/samples/src/test/java/com/example/bigquery/QueryClusteredTableIT.java b/samples/src/test/java/com/example/bigquery/QueryClusteredTableIT.java
new file mode 100644
index 000000000..fc07c5db0
--- /dev/null
+++ b/samples/src/test/java/com/example/bigquery/QueryClusteredTableIT.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.bigquery;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class QueryClusteredTableIT {
+  private ByteArrayOutputStream bout;
+  private PrintStream out;
+
+  @Before
+  public void setUp() {
+    bout = new ByteArrayOutputStream();
+    out = new PrintStream(bout);
+    System.setOut(out);
+  }
+
+  @After
+  public void tearDown() {
+    System.setOut(null);
+  }
+
+  @Test
+  public void queryClusteredTable() {
+    String projectId = "java-docs-samples-testing";
+    String datasetName = "bigquery_test_dataset";
+    String tableName = "clustered_shakespeare";
+
+    QueryClusteredTable.queryClusteredTable(projectId, datasetName, tableName);
+    assertThat(bout.toString()).contains("Query clustered table performed successfully.");
+  }
+}