diff --git a/tests/tests/media/src/android/media/cts/MediaMuxerTest.java b/tests/tests/media/src/android/media/cts/MediaMuxerTest.java
index c873691..6d919da 100644
--- a/tests/tests/media/src/android/media/cts/MediaMuxerTest.java
+++ b/tests/tests/media/src/android/media/cts/MediaMuxerTest.java
@@ -24,11 +24,14 @@
 import android.media.MediaFormat;
 import android.media.MediaMetadataRetriever;
 import android.media.MediaMuxer;
+import android.os.Build;
 import android.os.ParcelFileDescriptor;
 import android.platform.test.annotations.AppModeFull;
 import android.test.AndroidTestCase;
 import android.util.Log;
 
+import com.android.compatibility.common.util.MediaUtils;
+
 import android.media.cts.R;
 
 import java.io.File;
@@ -52,6 +55,8 @@
     private static final float TOLERANCE = 0.0002f;
     private static final long OFFSET_TIME_US = 29 * 60 * 1000000L; // 29 minutes
     private Resources mResources;
+    // running on 10, we can't reference the 11 symbols, so >10 vs >=11
+    private boolean mAndroid11 = Build.VERSION.SDK_INT > Build.VERSION_CODES.Q;
 
     @Override
     public void setContext(Context context) {
@@ -77,6 +82,8 @@
     }
 
     public void testDualAudioTrack() throws Exception {
+        if (!MediaUtils.check(mAndroid11, "test needs Android 11")) return;
+
         int source = R.raw.audio_aac_mono_70kbs_44100hz_aac_mono_70kbs_44100hz;
         String outputFile = File.createTempFile("MediaMuxerTest_testDualAudio", ".mp4")
                 .getAbsolutePath();
@@ -84,6 +91,8 @@
     }
 
     public void testDualVideoAndAudioTrack() throws Exception {
+        if (!MediaUtils.check(mAndroid11, "test needs Android 11")) return;
+
         int source = R.raw.video_h264_30fps_video_h264_30fps_aac_44100hz_aac_44100hz;
         String outputFile = File.createTempFile("MediaMuxerTest_testDualVideoAudio", ".mp4")
                 .getAbsolutePath();
