diff --git a/jib-core/src/test/java/com/google/cloud/tools/jib/builder/steps/StepsRunnerTest.java b/jib-core/src/test/java/com/google/cloud/tools/jib/builder/steps/StepsRunnerTest.java
index 6468ee051b..f19d0dd0f3 100644
--- a/jib-core/src/test/java/com/google/cloud/tools/jib/builder/steps/StepsRunnerTest.java
+++ b/jib-core/src/test/java/com/google/cloud/tools/jib/builder/steps/StepsRunnerTest.java
@@ -165,8 +165,9 @@ public void testObtainBaseImageLayers_skipObtainingDuplicateLayers()
 
   @Test
   public void testIsImagePushed_skipExistingEnabledAndManifestPresent() {
-    Optional<ManifestAndDigest<ManifestTemplate>> manifestResult = Mockito.mock(Optional.class);
-    when(manifestResult.isPresent()).thenReturn(true);
+    @SuppressWarnings("unchecked")
+    Optional<ManifestAndDigest<ManifestTemplate>> manifestResult =
+        Optional.of(Mockito.mock(ManifestAndDigest.class));
     System.setProperty(JibSystemProperties.SKIP_EXISTING_IMAGES, "true");
 
     Assert.assertFalse(stepsRunner.isImagePushed(manifestResult));
@@ -174,7 +175,7 @@ public void testIsImagePushed_skipExistingEnabledAndManifestPresent() {
 
   @Test
   public void testIsImagePushed_skipExistingImageDisabledAndManifestPresent() {
-    Optional<ManifestAndDigest<ManifestTemplate>> manifestResult = Mockito.mock(Optional.class);
+    Optional<ManifestAndDigest<ManifestTemplate>> manifestResult = Optional.empty();
     System.setProperty(JibSystemProperties.SKIP_EXISTING_IMAGES, "false");
 
     Assert.assertTrue(stepsRunner.isImagePushed(manifestResult));
@@ -182,9 +183,8 @@ public void testIsImagePushed_skipExistingImageDisabledAndManifestPresent() {
 
   @Test
   public void testIsImagePushed_skipExistingImageEnabledAndManifestNotPresent() {
-    Optional<ManifestAndDigest<ManifestTemplate>> manifestResult = Mockito.mock(Optional.class);
+    Optional<ManifestAndDigest<ManifestTemplate>> manifestResult = Optional.empty();
     System.setProperty(JibSystemProperties.SKIP_EXISTING_IMAGES, "true");
-    when(manifestResult.isPresent()).thenReturn(false);
 
     Assert.assertTrue(stepsRunner.isImagePushed(manifestResult));
   }