diff --git a/java-bigquery/samples/snippets/src/main/java/com/example/bigquery/SimpleQuery.java b/java-bigquery/samples/snippets/src/main/java/com/example/bigquery/SimpleQuery.java
index 429a339cf53c..311ddbd6ec46 100644
--- a/java-bigquery/samples/snippets/src/main/java/com/example/bigquery/SimpleQuery.java
+++ b/java-bigquery/samples/snippets/src/main/java/com/example/bigquery/SimpleQuery.java
@@ -29,8 +29,12 @@ public class SimpleQuery {
   public static void main(String[] args) {
     // TODO(developer): Replace this query before running the sample.
     String query =
-        "SELECT corpus, count(*) as corpus_count "
-            + "FROM `bigquery-public-data.samples.shakespeare` GROUP BY corpus;";
+        "SELECT name, SUM(number) as total_people "
+            + "FROM `bigquery-public-data.usa_names.usa_1910_2013` "
+            + "WHERE state = 'TX' "
+            + "GROUP BY name, state "
+            + "ORDER BY total_people DESC "
+            + "LIMIT 100;";
     simpleQuery(query);
   }
 
@@ -51,8 +55,8 @@ public static void simpleQuery(String query) {
           .iterateAll()
           .forEach(
               row -> {
-                System.out.print("corpus:" + row.get("corpus").getStringValue());
-                System.out.print(", count:" + row.get("corpus_count").getLongValue());
+                System.out.print("name:" + row.get("name").getStringValue());
+                System.out.print(", total_people:" + row.get("total_people").getLongValue());
                 System.out.println();
               });
 
diff --git a/java-bigquery/samples/snippets/src/test/java/com/example/bigquery/SimpleQueryIT.java b/java-bigquery/samples/snippets/src/test/java/com/example/bigquery/SimpleQueryIT.java
index 5441ffccad0d..f5c3bb1105b4 100644
--- a/java-bigquery/samples/snippets/src/test/java/com/example/bigquery/SimpleQueryIT.java
+++ b/java-bigquery/samples/snippets/src/test/java/com/example/bigquery/SimpleQueryIT.java
@@ -52,8 +52,12 @@ public void tearDown() {
   @Test
   public void testSimpleQuery() {
     String query =
-        "SELECT corpus, count(*) as corpus_count "
-            + "FROM `bigquery-public-data.samples.shakespeare` GROUP BY corpus;";
+        "SELECT name, SUM(number) as total_people "
+            + "FROM `bigquery-public-data.usa_names.usa_1910_2013` "
+            + "WHERE state = 'TX' "
+            + "GROUP BY name, state "
+            + "ORDER BY total_people DESC "
+            + "LIMIT 100;";
 
     SimpleQuery.simpleQuery(query);
     assertThat(bout.toString()).contains("Query ran successfully");