diff --git a/tensorflow/python/client/timeline_test.py b/tensorflow/python/client/timeline_test.py
index e7d60de6905..90ed4d18771 100644
--- a/tensorflow/python/client/timeline_test.py
+++ b/tensorflow/python/client/timeline_test.py
@@ -104,7 +104,10 @@ class TimelineTest(test.TestCase):
     step_stats = run_metadata.step_stats
     devices = [d.device for d in step_stats.dev_stats]
     self.assertTrue('/job:localhost/replica:0/task:0/device:GPU:0' in devices)
-    self.assertTrue('/device:GPU:0/stream:all' in devices)
+    if not test.is_built_with_rocm():
+      # skip this check for the ROCm platform
+      # stream level tracing is not yet supported on the ROCm platform
+      self.assertTrue('/device:GPU:0/stream:all' in devices)
     tl = timeline.Timeline(step_stats)
     ctf = tl.generate_chrome_trace_format()
     self._validateTrace(ctf)
diff --git a/tensorflow/python/profiler/internal/run_metadata_test.py b/tensorflow/python/profiler/internal/run_metadata_test.py
index daaff0ab601..ee0db8d3db3 100644
--- a/tensorflow/python/profiler/internal/run_metadata_test.py
+++ b/tensorflow/python/profiler/internal/run_metadata_test.py
@@ -129,7 +129,10 @@ class RunMetadataTest(test.TestCase):
 
     ret = _extract_node(run_meta, 'MatMul')
     self.assertEqual(len(ret['gpu:0']), 1)
-    self.assertEqual(len(ret['gpu:0/stream:all']), 1, '%s' % run_meta)
+    if not test.is_built_with_rocm():
+      # skip this check for the ROCm platform
+      # stream level tracing is not yet supported on the ROCm platform
+      self.assertEqual(len(ret['gpu:0/stream:all']), 1, '%s' % run_meta)
 
   @test_util.run_deprecated_v1
   def testAllocationHistory(self):
@@ -234,7 +237,11 @@ class RunMetadataTest(test.TestCase):
       for node in ret['gpu:0']:
         total_cpu_execs += node.op_end_rel_micros
 
-      self.assertGreaterEqual(len(ret['gpu:0/stream:all']), 4, '%s' % run_meta)
+      if not test.is_built_with_rocm():
+        # skip this check for the ROCm platform
+        # stream level tracing is not yet supported on the ROCm platform
+        self.assertGreaterEqual(len(ret['gpu:0/stream:all']),
+                                4, '%s' % run_meta)
 
 
 if __name__ == '__main__':
diff --git a/tensorflow/python/profiler/profile_context_test.py b/tensorflow/python/profiler/profile_context_test.py
index 885f08ca4b9..f4051ed7b7d 100644
--- a/tensorflow/python/profiler/profile_context_test.py
+++ b/tensorflow/python/profiler/profile_context_test.py
@@ -69,6 +69,13 @@ class ProfilerContextTest(test.TestCase):
         os.path.join(test.get_temp_dir(), "profile_100")) as profiler:
       profiler.profile_operations(options=opts)
       with gfile.Open(outfile, "r") as f:
+
+        if test.is_built_with_rocm():
+          # The profiler output for ROCm mode, includes an extra warning
+          # related to the lack of stream tracing in ROCm mode.
+          # Need to skip this warning when doing the diff
+          profile_str = "\n".join(profile_str.split("\n")[7:])
+
         self.assertEqual(profile_str, f.read())
 
   @test_util.run_deprecated_v1