diff --git a/src/com/android/settings/accessibility/PreviewSizeSeekBarController.java b/src/com/android/settings/accessibility/PreviewSizeSeekBarController.java
index f268a40cbdd..7f10af7aab2 100644
--- a/src/com/android/settings/accessibility/PreviewSizeSeekBarController.java
+++ b/src/com/android/settings/accessibility/PreviewSizeSeekBarController.java
@@ -210,8 +210,7 @@ abstract class PreviewSizeSeekBarController extends BasePreferenceController imp
             return;
         }
 
-        if (Flags.removeQsTooltipInSuw()
-                && mContext instanceof Activity
+        if (mContext instanceof Activity
                 && WizardManagerHelper.isAnySetupWizard(((Activity) mContext).getIntent())) {
             // Don't show QuickSettingsTooltip in Setup Wizard
             return;
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index 137be210702..e62e473c7c2 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -931,9 +931,7 @@ public abstract class ToggleFeaturePreferenceFragment extends DashboardFragment
         }
 
         Activity activity = getActivity();
-        if (com.android.settings.accessibility.Flags.removeQsTooltipInSuw()
-                && activity != null
-                && WizardManagerHelper.isAnySetupWizard(activity.getIntent())) {
+        if (activity != null && WizardManagerHelper.isAnySetupWizard(activity.getIntent())) {
             // Don't show QuickSettingsTooltip in Setup Wizard
             return;
         }
diff --git a/tests/robotests/src/com/android/settings/accessibility/PreviewSizeSeekBarControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/PreviewSizeSeekBarControllerTest.java
index af72bebe69d..05273fc050d 100644
--- a/tests/robotests/src/com/android/settings/accessibility/PreviewSizeSeekBarControllerTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/PreviewSizeSeekBarControllerTest.java
@@ -30,9 +30,6 @@ import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.os.Bundle;
-import android.platform.test.annotations.RequiresFlagsEnabled;
-import android.platform.test.flag.junit.CheckFlagsRule;
-import android.platform.test.flag.junit.DeviceFlagsValueProvider;
 import android.view.LayoutInflater;
 import android.widget.PopupWindow;
 import android.widget.SeekBar;
@@ -72,9 +69,6 @@ import org.robolectric.shadows.ShadowLooper;
 @Config(shadows = {ShadowInteractionJankMonitor.class})
 public class PreviewSizeSeekBarControllerTest {
 
-    @Rule
-    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();
-
     @Rule
     public ActivityScenarioRule<EmptyFragmentActivity> rule =
             new ActivityScenarioRule<>(EmptyFragmentActivity.class);
@@ -213,7 +207,6 @@ public class PreviewSizeSeekBarControllerTest {
     }
 
     @Test
-    @RequiresFlagsEnabled(Flags.FLAG_REMOVE_QS_TOOLTIP_IN_SUW)
     public void onProgressChanged_inSuw_toolTipShouldNotShown() {
         Intent intent = mContext.getIntent();
         intent.putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true);
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
index 3d0f223e35a..af94723132d 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
@@ -339,7 +339,6 @@ public class ToggleFeaturePreferenceFragmentTest {
     }
 
     @Test
-    @EnableFlags(com.android.settings.accessibility.Flags.FLAG_REMOVE_QS_TOOLTIP_IN_SUW)
     @Config(shadows = ShadowFragment.class)
     public void onPreferenceToggledOnEnabledService_inSuw_toolTipViewShouldNotShow() {
         Intent suwIntent = new Intent();