diff --git a/libwvdrmengine/run_gts_and_cts_tests.sh b/libwvdrmengine/run_gts_and_cts_tests.sh
index 563adc8d..dd01ae08 100755
--- a/libwvdrmengine/run_gts_and_cts_tests.sh
+++ b/libwvdrmengine/run_gts_and_cts_tests.sh
@@ -49,27 +49,30 @@ STDOUT_FILE="$OUT/atest.mediadrm.$ANDROID_SERIAL.$TIMESTAMP.stdout.log"
 STDERR_FILE="$OUT/atest.mediadrm.$ANDROID_SERIAL.$TIMESTAMP.stderr.log "
 LOGCAT_FILE="$OUT/atest.mediadrm.$ANDROID_SERIAL.$TIMESTAMP.logcat.log"
 
+WVTS_BASE="WvtsDeviceTestCases:com.google.android.wvts"
+GTS_BASE="GtsMediaTestCases:com.google.android.media.gts"
+
 adb logcat -c
 
 atest -v -s $ANDROID_SERIAL \
-  GtsMediaTestCases:com.google.android.media.gts.DecoderMetricsTests \
-  GtsMediaTestCases:com.google.android.media.gts.DrmSessionManagerTest \
-  GtsMediaTestCases:com.google.android.media.gts.MediaCodecCencTest \
-  GtsMediaTestCases:com.google.android.media.gts.MediaCodecStressTest \
-  GtsMediaTestCases:com.google.android.media.gts.MediaCodecTest \
-  GtsMediaTestCases:com.google.android.media.gts.MediaDrmTest \
-  GtsMediaTestCases:com.google.android.media.gts.MediaPlayerTest \
-  GtsMediaTestCases:com.google.android.media.gts.Vp8CodecTest \
-  GtsMediaTestCases:com.google.android.media.gts.WidevineCodecStressTests \
-  GtsMediaTestCases:com.google.android.media.gts.WidevineDashPolicyTests \
-  GtsMediaTestCases:com.google.android.media.gts.WidevineFailureTests \
-  GtsMediaTestCases:com.google.android.media.gts.WidevineGenericOpsTests \
-  GtsMediaTestCases:com.google.android.media.gts.WidevineH264PlaybackTests \
-  GtsMediaTestCases:com.google.android.media.gts.WidevineHEVCPlaybackTests \
-  GtsMediaTestCases:com.google.android.media.gts.WidevineHLSPlaybackTests \
-  GtsMediaTestCases:com.google.android.media.gts.WidevineIdentifierTests \
-  GtsMediaTestCases:com.google.android.media.gts.WidevineVP9WebMPlaybackTests \
-  GtsMediaTestCases:com.google.android.media.gts.WidevineYouTubePerformanceTests \
+  ${WVTS_BASE}.DecoderMetricsTests \
+  ${WVTS_BASE}.DrmSessionManagerTest \
+  ${WVTS_BASE}.MediaCodecCencTest \
+  ${GTS_BASE}.MediaCodecStressTest \
+  ${WVTS_BASE}.MediaCodecTest \
+  ${WVTS_BASE}.MediaDrmTest \
+  ${WVTS_BASE}.MediaPlayerTest \
+  ${WVTS_BASE}.Vp8CodecTest \
+  ${WVTS_BASE}.WidevineCodecStressTests \
+  ${WVTS_BASE}.WidevineDashPolicyTests \
+  ${WVTS_BASE}.WidevineFailureTests \
+  ${WVTS_BASE}.WidevineGenericOpsTests \
+  ${WVTS_BASE}.WidevineH264PlaybackTests \
+  ${WVTS_BASE}.WidevineHEVCPlaybackTests \
+  ${WVTS_BASE}.WidevineHLSPlaybackTests \
+  ${WVTS_BASE}.WidevineIdentifierTests \
+  ${WVTS_BASE}.WidevineVP9WebMPlaybackTests \
+  ${WVTS_BASE}.WidevineYouTubePerformanceTests \
   GtsExoPlayerTestCases:com.google.android.exoplayer.gts.DashStreamingTest \
   CtsMediaDrmTestCases:android.mediadrm.cts.MediaDrmClearkeyTest \
   CtsMediaDrmTestCases:android.mediadrm.cts.MediaDrmCodecTest \