diff --git a/tests/src/com/android/providers/calendar/CalendarConfidenceCheckerTest.java b/tests/src/com/android/providers/calendar/CalendarConfidenceCheckerTest.java
index cadaae0..7d3a679 100644
--- a/tests/src/com/android/providers/calendar/CalendarConfidenceCheckerTest.java
+++ b/tests/src/com/android/providers/calendar/CalendarConfidenceCheckerTest.java
@@ -19,10 +19,10 @@
 import static org.junit.Assert.assertTrue;
 
 import android.content.Context;
-import android.test.suitebuilder.annotation.SmallTest;
 import android.text.format.DateUtils;
 
 import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Before;
diff --git a/tests/src/com/android/providers/calendar/CalendarProvider2Test.java b/tests/src/com/android/providers/calendar/CalendarProvider2Test.java
index 11bccd4..2c96000 100644
--- a/tests/src/com/android/providers/calendar/CalendarProvider2Test.java
+++ b/tests/src/com/android/providers/calendar/CalendarProvider2Test.java
@@ -44,13 +44,14 @@
 import android.test.RenamingDelegatingContext;
 import android.test.mock.MockContentResolver;
 import android.test.mock.MockContext;
-import android.test.suitebuilder.annotation.SmallTest;
 import android.test.suitebuilder.annotation.Smoke;
-import android.test.suitebuilder.annotation.Suppress;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.util.Log;
 
+import androidx.test.filters.SmallTest;
+import androidx.test.filters.Suppress;
+
 import com.android.calendarcommon2.Time;
 import com.android.providers.calendar.enterprise.CrossProfileCalendarHelper;
 
diff --git a/tests/src/com/android/providers/calendar/CalendarProviderBroadcastReceiverTest.java b/tests/src/com/android/providers/calendar/CalendarProviderBroadcastReceiverTest.java
index 09a19f5..e446b2f 100644
--- a/tests/src/com/android/providers/calendar/CalendarProviderBroadcastReceiverTest.java
+++ b/tests/src/com/android/providers/calendar/CalendarProviderBroadcastReceiverTest.java
@@ -21,7 +21,8 @@
 import android.content.Context;
 import android.content.Intent;
 import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.LargeTest;
+
+import androidx.test.filters.LargeTest;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
diff --git a/tests/src/com/android/providers/calendar/ICalendarTest.java b/tests/src/com/android/providers/calendar/ICalendarTest.java
index bbc4bb3..ef52f26 100644
--- a/tests/src/com/android/providers/calendar/ICalendarTest.java
+++ b/tests/src/com/android/providers/calendar/ICalendarTest.java
@@ -1,9 +1,10 @@
 // Copyright 2007 The Android Open Source Project
 package com.android.providers.calendar;
 
+import androidx.test.filters.SmallTest;
+
 import com.android.calendarcommon2.ICalendar;
 
-import android.test.suitebuilder.annotation.SmallTest;
 import junit.framework.TestCase;
 
 import java.util.List;
diff --git a/tests/src/com/android/providers/calendar/RecurrenceSetTest.java b/tests/src/com/android/providers/calendar/RecurrenceSetTest.java
index f8b3704..34e4b94 100644
--- a/tests/src/com/android/providers/calendar/RecurrenceSetTest.java
+++ b/tests/src/com/android/providers/calendar/RecurrenceSetTest.java
@@ -16,12 +16,14 @@
 
 package com.android.providers.calendar;
 
+import android.content.ContentValues;
+import android.provider.CalendarContract;
+
+import androidx.test.filters.SmallTest;
+
 import com.android.calendarcommon2.ICalendar;
 import com.android.calendarcommon2.RecurrenceSet;
 
-import android.content.ContentValues;
-import android.provider.CalendarContract;
-import android.test.suitebuilder.annotation.SmallTest;
 import junit.framework.TestCase;
 
 import java.util.List;