diff --git a/java/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTypePrimitive.java b/java/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTypePrimitive.java
index 5292f8f..9dce995 100644
--- a/java/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTypePrimitive.java
+++ b/java/src/main/java/com/azure/data/cosmos/serialization/hybridrow/layouts/LayoutTypePrimitive.java
@@ -15,7 +15,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 
 public abstract class LayoutTypePrimitive<T> extends LayoutType implements ILayoutType {
     /**
-     * Initializes a new instance of the {@link LayoutTypePrimitive<T>} class.
+     * Initializes a new instance of the {@link LayoutTypePrimitive} class.
      *
      * @param code
      * @param immutable
@@ -26,7 +26,7 @@ public abstract class LayoutTypePrimitive<T> extends LayoutType implements ILayo
     }
 
     /**
-     * Initializes a new instance of the {@link LayoutTypePrimitive<T>} class.
+     * Initializes a new instance of the {@link LayoutTypePrimitive} class.
      *
      * @param code
      * @param size
diff --git a/java/src/test/java/com/azure/data/cosmos/core/Utf8StringTest.java b/java/src/test/java/com/azure/data/cosmos/core/Utf8StringTest.java
index 62bda68..35fb933 100644
--- a/java/src/test/java/com/azure/data/cosmos/core/Utf8StringTest.java
+++ b/java/src/test/java/com/azure/data/cosmos/core/Utf8StringTest.java
@@ -20,6 +20,7 @@ import static org.testng.Assert.assertSame;
 import static org.testng.Assert.assertThrows;
 import static org.testng.Assert.assertTrue;
 
+@Test(groups = "unit")
 public class Utf8StringTest {
 
     @Test
diff --git a/java/src/test/java/com/azure/data/cosmos/core/UtfAnyStringTest.java b/java/src/test/java/com/azure/data/cosmos/core/UtfAnyStringTest.java
index b017abd..e4aacf0 100644
--- a/java/src/test/java/com/azure/data/cosmos/core/UtfAnyStringTest.java
+++ b/java/src/test/java/com/azure/data/cosmos/core/UtfAnyStringTest.java
@@ -5,6 +5,7 @@ package com.azure.data.cosmos.core;
 
 import org.testng.annotations.Test;
 
+@Test(groups = "unit")
 public class UtfAnyStringTest {
 
     @Test
diff --git a/java/src/test/java/com/azure/data/cosmos/serialization/hybridrow/codecs/DateTimeCodecTest.java b/java/src/test/java/com/azure/data/cosmos/serialization/hybridrow/codecs/DateTimeCodecTest.java
index e80a0b8..fed1b7d 100644
--- a/java/src/test/java/com/azure/data/cosmos/serialization/hybridrow/codecs/DateTimeCodecTest.java
+++ b/java/src/test/java/com/azure/data/cosmos/serialization/hybridrow/codecs/DateTimeCodecTest.java
@@ -25,6 +25,7 @@ import static org.testng.Assert.assertEquals;
  * Console.WriteLine($"new DateTimeItem(new byte[] {{ (byte) {string.Join(", (byte) ", buffer )} }}, OffsetDateTime.parse(\"{value.ToString("o")}\"))");
  * }
  */
+@Test(groups = "unit")
 public class DateTimeCodecTest {
 
     @Test(dataProvider = "dateTimeDataProvider")
diff --git a/java/src/test/java/com/azure/data/cosmos/serialization/hybridrow/codecs/DecimalCodecTest.java b/java/src/test/java/com/azure/data/cosmos/serialization/hybridrow/codecs/DecimalCodecTest.java
index 1fedd08..85e32dd 100644
--- a/java/src/test/java/com/azure/data/cosmos/serialization/hybridrow/codecs/DecimalCodecTest.java
+++ b/java/src/test/java/com/azure/data/cosmos/serialization/hybridrow/codecs/DecimalCodecTest.java
@@ -27,6 +27,7 @@ import static org.testng.Assert.assertEquals;
  * {value.ToString()}\"))");
  * }
  */
+@Test(groups = "unit")
 public class DecimalCodecTest {
 
     @Test(dataProvider = "decimalDataProvider")
diff --git a/java/src/test/java/com/azure/data/cosmos/serialization/hybridrow/codecs/GuidCodecTest.java b/java/src/test/java/com/azure/data/cosmos/serialization/hybridrow/codecs/GuidCodecTest.java
index cad851c..73f35a6 100644
--- a/java/src/test/java/com/azure/data/cosmos/serialization/hybridrow/codecs/GuidCodecTest.java
+++ b/java/src/test/java/com/azure/data/cosmos/serialization/hybridrow/codecs/GuidCodecTest.java
@@ -25,6 +25,7 @@ import static org.testng.Assert.assertEquals;
  * Console.WriteLine($"new GuidItem(new byte[] {{ (byte) {string.Join(", (byte) ", buffer )} }}, UUID.fromString(\"{value.ToString()}\"))");
  * }
  */
+@Test(groups = "unit")
 public class GuidCodecTest {
 
     @Test(dataProvider = "guidDataProvider")
diff --git a/java/src/test/java/com/azure/data/cosmos/serialization/hybridrow/layouts/SystemSchemaTest.java b/java/src/test/java/com/azure/data/cosmos/serialization/hybridrow/layouts/SystemSchemaTest.java
index 82765d3..a05e4af 100644
--- a/java/src/test/java/com/azure/data/cosmos/serialization/hybridrow/layouts/SystemSchemaTest.java
+++ b/java/src/test/java/com/azure/data/cosmos/serialization/hybridrow/layouts/SystemSchemaTest.java
@@ -10,11 +10,12 @@ import java.nio.file.Paths;
 
 import static org.testng.Assert.*;
 
+@Test(groups = "unit")
 public class SystemSchemaTest {
 
     private static final Path SchemaFile = Paths.get("data", "CustomerSchema.json");
 
-    @Test
+    @Test(enabled = false)
     public void testLoadSchema() {
 
         final LayoutResolver layoutResolver = SystemSchema.layoutResolver();
diff --git a/java/src/test/resources/log4j.properties b/java/src/test/resources/log4j.properties
new file mode 100644
index 0000000..00b89ec
--- /dev/null
+++ b/java/src/test/resources/log4j.properties
@@ -0,0 +1,16 @@
+# this is the log4j configuration for tests
+
+# Set root logger level to DEBUG and its only appender to A1.
+log4j.rootLogger=INFO, A1
+
+# Set HTTP components' logger to INFO
+
+log4j.category.io.netty=INFO
+log4j.category.io.reactivex=INFO
+log4j.category.com.microsoft.azure.cosmosdb=INFO
+# A1 is set to be a ConsoleAppender.
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+
+# A1 uses PatternLayout.
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%d %5X{pid} [%t] %-5p %c - %m%n