diff --git a/server/site_tests/enterprise_LongevityTrackerServer/control.chromesign b/server/site_tests/enterprise_LongevityTrackerServer/control.chromesign_20min
similarity index 88%
rename from server/site_tests/enterprise_LongevityTrackerServer/control.chromesign
rename to server/site_tests/enterprise_LongevityTrackerServer/control.chromesign_20min
index acf50fc..4b21761 100644
--- a/server/site_tests/enterprise_LongevityTrackerServer/control.chromesign
+++ b/server/site_tests/enterprise_LongevityTrackerServer/control.chromesign_20min
@@ -3,13 +3,13 @@
 # found in the LICENSE file.
 
 AUTHOR = "krishnargv"
-NAME = "enterprise_LongevityTrackerServer.chromesign"
-PURPOSE = "Tracks Chrome OS performance over long periods."
+NAME = "enterprise_LongevityTrackerServer.chromesign_20min"
+PURPOSE = "Tracks Chrome OS performance over a 20min period."
 TIME = "LONG"
 TEST_CATEGORY = "Performance"
 TEST_CLASS = "performance"
 TEST_TYPE = "server"
-ATTRIBUTES = "suite:longevity, suite:longevity_two"
+ATTRIBUTES = "suite:longevity"
 DEPENDENCIES = "chromesign"
 JOB_RETRIES = 3
 
diff --git a/server/site_tests/enterprise_LongevityTrackerServer/control.chromesign b/server/site_tests/enterprise_LongevityTrackerServer/control.chromesign_3hr
similarity index 75%
copy from server/site_tests/enterprise_LongevityTrackerServer/control.chromesign
copy to server/site_tests/enterprise_LongevityTrackerServer/control.chromesign_3hr
index acf50fc..e0ec110 100644
--- a/server/site_tests/enterprise_LongevityTrackerServer/control.chromesign
+++ b/server/site_tests/enterprise_LongevityTrackerServer/control.chromesign_3hr
@@ -3,20 +3,20 @@
 # found in the LICENSE file.
 
 AUTHOR = "krishnargv"
-NAME = "enterprise_LongevityTrackerServer.chromesign"
-PURPOSE = "Tracks Chrome OS performance over long periods."
+NAME = "enterprise_LongevityTrackerServer.chromesign_3hr"
+PURPOSE = "Tracks Chrome OS performance over a 3hour period."
 TIME = "LONG"
 TEST_CATEGORY = "Performance"
 TEST_CLASS = "performance"
 TEST_TYPE = "server"
-ATTRIBUTES = "suite:longevity, suite:longevity_two"
+ATTRIBUTES = "suite:longevity_two"
 DEPENDENCIES = "chromesign"
 JOB_RETRIES = 3
 
 DOC = """
 This test enrolls ChromeOS device into kiosk mode and captures device resource
 data including cpu and memory usage, and temperature data after the kiosk app
-auto launches. This test runs for 20 minutes, the perf metrics are captured every 60 seconds.
+auto launches. This test runs for 3 hours, the perf metrics are captured every 2 mins.
 """
 
 
@@ -26,9 +26,9 @@
     # See README.txt for perf_params format
     perf_params = {
         'perf_capture_iterations': 1,
-        'perf_capture_duration': 1200,
-        'sample_interval': 60,
-        'metric_interval': 300,
+        'perf_capture_duration': 10800,
+        'sample_interval': 120,
+        'metric_interval': 1800,
         'test_type': 'single_sample',
         'kiosk_app_attributes': ('chromesign:'
                             'odjaaghiehpobimgdjjfofmablbaleem:'
diff --git a/tko/perf_upload/perf_dashboard_config.json b/tko/perf_upload/perf_dashboard_config.json
index 2106ee0..9745f72 100644
--- a/tko/perf_upload/perf_dashboard_config.json
+++ b/tko/perf_upload/perf_dashboard_config.json
@@ -157,14 +157,16 @@
     "master_name": "ChromeOSPerf"
   },
   {
-    "autotest_name": "enterprise_LongevityTrackerServer.chromesign",
-    "master_name": "ChromeOS_Enterprise",
-    "dashboard_test_name": "enterprise_LongevityTrackerServer"
+    "autotest_name": "enterprise_LongevityTrackerServer.chromesign_20min",
+    "master_name": "ChromeOS_Enterprise"
+  },
+  {
+    "autotest_name": "enterprise_LongevityTrackerServer.chromesign_3hr",
+    "master_name": "ChromeOS_Enterprise"
   },
   {
     "autotest_name": "enterprise_LongevityTrackerServer.riseplayer",
-    "master_name": "ChromeOS_Enterprise",
-    "dashboard_test_name": "enterprise_LongevityTrackerServer"
+    "master_name": "ChromeOS_Enterprise"
   },
   {
     "autotest_name": "network_WiFi_AttenuatedPerf.ht40_ch001",