diff --git a/tests/autofillservice/src/android/autofillservice/cts/DismissType.java b/tests/autofillservice/src/android/autofillservice/cts/DismissType.java
index e8e7689..ae9b9cd 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/DismissType.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/DismissType.java
@@ -26,6 +26,5 @@
     HOME_BUTTON,
     RECENTS_BUTTON,
     TOUCH_OUTSIDE,
-    FOCUS_OUTSIDE,
-    LAUNCH_ACTIVITY
+    FOCUS_OUTSIDE
 }
diff --git a/tests/autofillservice/src/android/autofillservice/cts/LoginActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/LoginActivityTest.java
index 9b575ec..4354ad1 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/LoginActivityTest.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/LoginActivityTest.java
@@ -1211,15 +1211,6 @@
         saveGoesAway(DismissType.TOUCH_OUTSIDE);
     }
 
-    @Test
-    public void testSaveGoesAwayWhenLaunchingNewActivity() throws Exception {
-        try {
-            saveGoesAway(DismissType.LAUNCH_ACTIVITY);
-        } finally {
-            CheckoutActivity.finishIt();
-        }
-    }
-
     private void saveGoesAway(DismissType dismissType) throws Exception {
         enableService();
 
@@ -1265,9 +1256,6 @@
                 sUiBot.switchAppsUsingRecents();
                 sUiBot.assertShownByRelativeId(CheckoutActivity.ID_ADDRESS);
                 break;
-            case LAUNCH_ACTIVITY:
-                startCheckoutActivityAsNewTask();
-                break;
             default:
                 throw new IllegalArgumentException("invalid dismiss type: " + dismissType);
         }
diff --git a/tests/autofillservice/src/android/autofillservice/cts/SimpleSaveActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/SimpleSaveActivityTest.java
index 5f7713c..b63f098 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/SimpleSaveActivityTest.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/SimpleSaveActivityTest.java
@@ -189,16 +189,6 @@
         dismissSaveTest(DismissType.RECENTS_BUTTON);
     }
 
-    @Test
-    public void testDismissSave_byLaunchingNewActivity() throws Exception {
-        startActivity();
-        try {
-            dismissSaveTest(DismissType.LAUNCH_ACTIVITY);
-        } finally {
-            WelcomeActivity.finishIt();
-        }
-    }
-
     private void dismissSaveTest(DismissType dismissType) throws Exception {
         // Set service.
         enableService();
@@ -239,9 +229,6 @@
                 sUiBot.switchAppsUsingRecents();
                 WelcomeActivity.assertShowingDefaultMessage(sUiBot);
                 break;
-            case LAUNCH_ACTIVITY:
-                startWelcomeActivityOnNewTask();
-                break;
             default:
                 throw new IllegalArgumentException("invalid dismiss type: " + dismissType);
         }
