diff --git a/examples/bazel/.bazelversion b/examples/bazel/.bazelversion
new file mode 100644
index 00000000000..c0be8a7992a
--- /dev/null
+++ b/examples/bazel/.bazelversion
@@ -0,0 +1 @@
+6.4.0
\ No newline at end of file
diff --git a/javatests/dagger/functional/basic/BasicTest.java b/javatests/dagger/functional/basic/BasicTest.java
index a3e4419052a..a4e26e815c7 100644
--- a/javatests/dagger/functional/basic/BasicTest.java
+++ b/javatests/dagger/functional/basic/BasicTest.java
@@ -61,23 +61,23 @@ public class BasicTest {
   }
 
   @Theory public void boxedPrimitives(BasicComponent basicComponent) {
-    assertThat(basicComponent.getBoxedByte()).isEqualTo(new Byte(BOUND_BYTE));
-    assertThat(basicComponent.getBoxedChar()).isEqualTo(new Character(BOUND_CHAR));
-    assertThat(basicComponent.getBoxedShort()).isEqualTo(new Short(BOUND_SHORT));
-    assertThat(basicComponent.getBoxedInt()).isEqualTo(new Integer(BOUND_INT));
-    assertThat(basicComponent.getBoxedLong()).isEqualTo(new Long(BOUND_LONG));
-    assertThat(basicComponent.getBoxedBoolean()).isEqualTo(new Boolean(BOUND_BOOLEAN));
+    assertThat(basicComponent.getBoxedByte()).isEqualTo(BOUND_BYTE);
+    assertThat(basicComponent.getBoxedChar()).isEqualTo(BOUND_CHAR);
+    assertThat(basicComponent.getBoxedShort()).isEqualTo(BOUND_SHORT);
+    assertThat(basicComponent.getBoxedInt()).isEqualTo(BOUND_INT);
+    assertThat(basicComponent.getBoxedLong()).isEqualTo(BOUND_LONG);
+    assertThat(basicComponent.getBoxedBoolean()).isEqualTo(BOUND_BOOLEAN);
     assertThat(basicComponent.getBoxedFloat()).isEqualTo(BOUND_FLOAT);
     assertThat(basicComponent.getBoxedDouble()).isEqualTo(BOUND_DOUBLE);
   }
 
   @Theory public void boxedPrimitiveProviders(BasicComponent basicComponent) {
-    assertThat(basicComponent.getByteProvider().get()).isEqualTo(new Byte(BOUND_BYTE));
-    assertThat(basicComponent.getCharProvider().get()).isEqualTo(new Character(BOUND_CHAR));
-    assertThat(basicComponent.getShortProvider().get()).isEqualTo(new Short(BOUND_SHORT));
-    assertThat(basicComponent.getIntProvider().get()).isEqualTo(new Integer(BOUND_INT));
-    assertThat(basicComponent.getLongProvider().get()).isEqualTo(new Long(BOUND_LONG));
-    assertThat(basicComponent.getBooleanProvider().get()).isEqualTo(new Boolean(BOUND_BOOLEAN));
+    assertThat(basicComponent.getByteProvider().get()).isEqualTo(BOUND_BYTE);
+    assertThat(basicComponent.getCharProvider().get()).isEqualTo(BOUND_CHAR);
+    assertThat(basicComponent.getShortProvider().get()).isEqualTo(BOUND_SHORT);
+    assertThat(basicComponent.getIntProvider().get()).isEqualTo(BOUND_INT);
+    assertThat(basicComponent.getLongProvider().get()).isEqualTo(BOUND_LONG);
+    assertThat(basicComponent.getBooleanProvider().get()).isEqualTo(BOUND_BOOLEAN);
     assertThat(basicComponent.getFloatProvider().get()).isEqualTo(BOUND_FLOAT);
     assertThat(basicComponent.getDoubleProvider().get()).isEqualTo(BOUND_DOUBLE);
   }