diff --git a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java
index dcca102a1679..9f1fe0c80277 100644
--- a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java
+++ b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreEmulator.java
@@ -35,9 +35,8 @@
 /**
  * An extension to {@link Datastore} that provides lifecycle management for a datastore emulator.
  *
- * <p>In order to use the emulator for a JUnit 4 test you might do something like this:
- *
  * <pre>
+ * // In order to use the emulator for a JUnit 4 test you might do something like this:
  * public class MyTest {
  *
  *   static DatastoreEmulator datastore;
diff --git a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreOptions.java b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreOptions.java
index 9a7045809de8..b7421f0c8173 100644
--- a/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreOptions.java
+++ b/java-datastore/datastore-v1-proto-client/src/main/java/com/google/datastore/v1/client/DatastoreOptions.java
@@ -26,9 +26,8 @@
 /**
  * An immutable object containing settings for the datastore.
  *
- * <p>Example for connecting to a datastore:
- *
  * <pre>
+ * // Example for connecting to a datastore:
  * DatastoreOptions options = new DatastoreOptions.Builder()
  *     .projectId("my-project-id")
  *     .credential(DatastoreHelper.getComputeEngineCredential())