diff --git a/asset/src/main/java/com/example/asset/BatchGetAssetsHistoryExample.java b/asset/src/main/java/com/example/asset/BatchGetAssetsHistoryExample.java
index e244bfe767c..18471594f46 100644
--- a/asset/src/main/java/com/example/asset/BatchGetAssetsHistoryExample.java
+++ b/asset/src/main/java/com/example/asset/BatchGetAssetsHistoryExample.java
@@ -33,14 +33,12 @@ public class BatchGetAssetsHistoryExample {
   // Use the default project Id.
   private static final String projectId = ServiceOptions.getDefaultProjectId();
 
-  // Export assets for a project.
-  // @param args path where the results will be exported to.
   public static void main(String... args) throws Exception {
     // Asset names, e.g.: "//storage.googleapis.com/[BUCKET_NAME]"
     String[] assetNames = args[0].split(",");
     try (AssetServiceClient client = AssetServiceClient.create()) {
       ProjectName parent = ProjectName.of(projectId);
-      ContentType contentType = ContentType.CONTENT_TYPE_UNSPECIFIED;
+      ContentType contentType = ContentType.RESOURCE;
       TimeWindow readTimeWindow = TimeWindow.newBuilder().build();
       BatchGetAssetsHistoryRequest request =
           BatchGetAssetsHistoryRequest.newBuilder()
diff --git a/asset/src/test/java/com/example/asset/QuickStartIT.java b/asset/src/test/java/com/example/asset/QuickStartIT.java
index 8616d0e0009..1a9a1dad98c 100644
--- a/asset/src/test/java/com/example/asset/QuickStartIT.java
+++ b/asset/src/test/java/com/example/asset/QuickStartIT.java
@@ -27,6 +27,7 @@
 import com.google.cloud.bigquery.DatasetInfo;
 import com.google.cloud.bigquery.testing.RemoteBigQueryHelper;
 import com.google.cloud.storage.BlobInfo;
+import com.google.cloud.storage.BucketInfo;
 import com.google.cloud.storage.Storage;
 import com.google.cloud.storage.Storage.BlobListOption;
 import com.google.cloud.storage.StorageOptions;
@@ -36,7 +37,9 @@
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.Timeout;
@@ -53,6 +56,8 @@ public class QuickStartIT {
   private static final String bucketName = "java-docs-samples-testing";
   private static final String[] assetTypes = { "compute.googleapis.com/Network" };
 
+  private static final String testBucket = "java-docs-test-bucket-" + UUID.randomUUID().toString();
+
   private ByteArrayOutputStream bout;
   private PrintStream out;
   private PrintStream originalPrintStream;
@@ -134,12 +139,22 @@ public void testExportAssetBigqueryExample() throws Exception {
 
   @Test
   public void testBatchGetAssetsHistory() throws Exception {
-    String bucketAssetName = String.format("//storage.googleapis.com/%s", bucketName);
+    String bucketAssetName = String.format("//storage.googleapis.com/%s", testBucket);
     BatchGetAssetsHistoryExample.main(bucketAssetName);
     String got = bout.toString();
-    if (!got.isEmpty()) {
-      assertThat(got).contains(bucketAssetName);
-    }
+    assertThat(got).contains(bucketAssetName);
+  }
+
+  @BeforeClass
+  public static void createTestBucket() {
+    Storage storage = StorageOptions.getDefaultInstance().getService();
+    storage.create(BucketInfo.of(testBucket));
+  }
+
+  @AfterClass
+  public static void deleteTestBucket() {
+    Storage storage = StorageOptions.getDefaultInstance().getService();
+    storage.delete(testBucket);
   }
 
   protected String getDataset(String datasetName) throws BigQueryException {