diff --git a/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.cpp b/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.cpp
index 671d079..2b39bc6 100644
--- a/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.cpp
+++ b/tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.cpp
@@ -684,10 +684,6 @@
     if (!live.hasFrontendConnection) {
         return;
     }
-    // Do not execute tests for IPTV Frontend
-    if (frontendMap[live.frontendId].type == FrontendType::IPTV) {
-        return;
-    }
     auto live_configs = generateLiveConfigurations();
     for (auto& configuration : live_configs) {
         live = configuration;
@@ -784,10 +780,6 @@
     if (!live.hasFrontendConnection) {
         return;
     }
-    // Do not execute tests for IPTV Frontend
-    if (frontendMap[live.frontendId].type == FrontendType::IPTV) {
-        return;
-    }
     // TODO use parameterized tests
     auto live_configs = generateLiveConfigurations();
     for (auto& configuration : live_configs) {
@@ -802,10 +794,6 @@
     if (!live.hasFrontendConnection) {
         return;
     }
-    // Do not execute tests for IPTV Frontend
-    if (frontendMap[live.frontendId].type == FrontendType::IPTV) {
-        return;
-    }
     auto live_configs = generateLiveConfigurations();
     for (auto& configuration : live_configs) {
         live = configuration;
@@ -821,10 +809,6 @@
     if (!live.hasFrontendConnection) {
         return;
     }
-    // Do not execute tests for IPTV Frontend
-    if (frontendMap[live.frontendId].type == FrontendType::IPTV) {
-        return;
-    }
     // TODO use parameterized tests
     auto live_configs = generateLiveConfigurations();
     for (auto& configuration : live_configs) {
@@ -1128,7 +1112,7 @@
     if (!record.support) {
         return;
     }
-    // Do not execute tests for IPTV Frontend
+    // Recording is not currently supported for IPTV frontend
     if (frontendMap[live.frontendId].type == FrontendType::IPTV) {
         return;
     }
@@ -1146,7 +1130,7 @@
     if (!record.support) {
         return;
     }
-    // Do not execute tests for IPTV Frontend
+    // Recording is not currently supported for IPTV frontend
     if (frontendMap[live.frontendId].type == FrontendType::IPTV) {
         return;
     }
@@ -1182,7 +1166,7 @@
     if (!record.support) {
         return;
     }
-    // Do not execute tests for IPTV Frontend
+    // Recording is not currently supported for IPTV frontend
     if (frontendMap[live.frontendId].type == FrontendType::IPTV) {
         return;
     }
@@ -1287,10 +1271,6 @@
 
 TEST_P(TunerFrontendAidlTest, getHardwareInfo) {
     description("Test Frontend get hardware info");
-    // Do not execute tests for IPTV Frontend
-    if (frontendMap[live.frontendId].type == FrontendType::IPTV) {
-        return;
-    }
     if (!live.hasFrontendConnection) {
         return;
     }
@@ -1338,10 +1318,6 @@
     if (!live.hasFrontendConnection) {
         return;
     }
-    // Do not execute tests for IPTV Frontend
-    if (frontendMap[live.frontendId].type == FrontendType::IPTV) {
-        return;
-    }
     auto live_configs = generateLiveConfigurations();
     for (auto& configuration : live_configs) {
         live = configuration;
@@ -1369,10 +1345,6 @@
     if (!live.hasFrontendConnection) {
         return;
     }
-    // Do not execute tests for IPTV Frontend
-    if (frontendMap[live.frontendId].type == FrontendType::IPTV) {
-        return;
-    }
     auto live_configs = generateLiveConfigurations();
     for (auto& configuration : live_configs) {
         live = configuration;
@@ -1402,10 +1374,6 @@
     if (!live.hasFrontendConnection) {
         return;
     }
-    // Do not execute tests for IPTV Frontend
-    if (frontendMap[live.frontendId].type == FrontendType::IPTV) {
-        return;
-    }
     auto live_configs = generateLiveConfigurations();
     for (auto& configuration : live_configs) {
         live = configuration;
@@ -1419,10 +1387,6 @@
     if (!descrambling.support) {
         return;
     }
-    // Do not execute tests for IPTV Frontend
-    if (frontendMap[live.frontendId].type == FrontendType::IPTV) {
-        return;
-    }
     vector<DescramblingHardwareConnections> descrambling_configs =
             generateDescramblingConfigurations();
     if (descrambling_configs.empty()) {
@@ -1459,10 +1423,6 @@
     if (!descrambling.support) {
         return;
     }
-    // Do not execute tests for IPTV Frontend
-    if (frontendMap[live.frontendId].type == FrontendType::IPTV) {
-        return;
-    }
     vector<DescramblingHardwareConnections> descrambling_configs =
             generateDescramblingConfigurations();
     if (descrambling_configs.empty()) {
