diff --git a/flang/test/Examples/omp-atomic.f90 b/flang/test/Examples/omp-atomic.f90
--- a/flang/test/Examples/omp-atomic.f90
+++ b/flang/test/Examples/omp-atomic.f90
@@ -1,5 +1,3 @@
-! Check the flang-omp-report plugin for omp-atomic.f90
-
 ! REQUIRES: plugins, examples, shell
 
 ! RUN: %flang_fc1 -load %llvmshlibdir/flangOmpReport.so -plugin flang-omp-report -fopenmp %s -o - | FileCheck %s
@@ -27,29 +25,29 @@
 
 ! CHECK:---
 ! CHECK-NEXT:- file:            '{{[^"]*}}omp-atomic.f90'
-! CHECK-NEXT:  line:            11
+! CHECK-NEXT:  line:            9
 ! CHECK-NEXT:  construct:       atomic-read
 ! CHECK-NEXT:  clauses:
 ! CHECK-NEXT:    - clause:      seq_cst
 ! CHECK-NEXT:      details:     ''
 ! CHECK-NEXT:- file:            '{{[^"]*}}omp-atomic.f90'
-! CHECK-NEXT:  line:            14
+! CHECK-NEXT:  line:            12
 ! CHECK-NEXT:  construct:       atomic-write
 ! CHECK-NEXT:  clauses:
 ! CHECK-NEXT:    - clause:      seq_cst
 ! CHECK-NEXT:      details:     ''
 ! CHECK-NEXT:- file:            '{{[^"]*}}omp-atomic.f90'
-! CHECK-NEXT:  line:            18
+! CHECK-NEXT:  line:            16
 ! CHECK-NEXT:  construct:       atomic-capture
 ! CHECK-NEXT:  clauses:
 ! CHECK-NEXT:    - clause:      seq_cst
 ! CHECK-NEXT:      details:     ''
 ! CHECK-NEXT:- file:            '{{[^"]*}}omp-atomic.f90'
-! CHECK-NEXT:  line:            23
+! CHECK-NEXT:  line:            21
 ! CHECK-NEXT:  construct:       atomic-atomic
 ! CHECK-NEXT:  clauses:         []
 ! CHECK-NEXT:- file:            '{{[^"]*}}omp-atomic.f90'
-! CHECK-NEXT:  line:            10
+! CHECK-NEXT:  line:            8
 ! CHECK-NEXT:  construct:       parallel
 ! CHECK-NEXT:  clauses:
 ! CHECK-NEXT:    - clause:      num_threads
diff --git a/flang/test/Examples/omp-declarative-directive.f90 b/flang/test/Examples/omp-declarative-directive.f90
--- a/flang/test/Examples/omp-declarative-directive.f90
+++ b/flang/test/Examples/omp-declarative-directive.f90
@@ -1,5 +1,3 @@
-! Check the flang-omp-report plugin for omp-declarative-directive.f90
-
 ! REQUIRES: plugins, examples, shell
 
 ! RUN: %flang_fc1 -load %llvmshlibdir/flangOmpReport.so -plugin flang-omp-report -fopenmp %s -o - | FileCheck %s
@@ -31,13 +29,13 @@
 
 ! CHECK:---
 ! CHECK-NEXT:- file:            '{{[^"]*}}omp-declarative-directive.f90'
-! CHECK-NEXT:  line:            13
+! CHECK-NEXT:  line:            11
 ! CHECK-NEXT:  construct:       declare simd
 ! CHECK-NEXT:  clauses:
 ! CHECK-NEXT:    - clause:      aligned
 ! CHECK-NEXT:      details:     a
 ! CHECK-NEXT:- file:            '{{[^"]*}}omp-declarative-directive.f90'
-! CHECK-NEXT:  line:            23
+! CHECK-NEXT:  line:            21
 ! CHECK-NEXT:  construct:       declare target
 ! CHECK-NEXT:  clauses:         []
 ! CHECK-NEXT:...
diff --git a/flang/test/Examples/omp-device-constructs.f90 b/flang/test/Examples/omp-device-constructs.f90
--- a/flang/test/Examples/omp-device-constructs.f90
+++ b/flang/test/Examples/omp-device-constructs.f90
@@ -1,5 +1,3 @@
-! Check flang-omp-report --femit-yaml for omp-device-constructs.f90
-
 ! REQUIRES: plugins, examples, shell
 
 !RUN: %flang_fc1 -load %llvmshlibdir/flangOmpReport.so -plugin flang-omp-report -fopenmp %s -o - | FileCheck %s
@@ -55,25 +53,25 @@
 
 ! CHECK: ---
 ! CHECK-NEXT: - file:            '{{[^"]*}}omp-device-constructs.f90'
-! CHECK-NEXT:   line:            18
+! CHECK-NEXT:   line:            16
 ! CHECK-NEXT:   construct:       target
 ! CHECK-NEXT:   clauses:
 ! CHECK-NEXT:     - clause:          map
 ! CHECK-NEXT:       details:         arraya
 ! CHECK-NEXT: - file:            '{{[^"]*}}omp-device-constructs.f90'
-! CHECK-NEXT:   line:            24
+! CHECK-NEXT:   line:            22
 ! CHECK-NEXT:   construct:       target
 ! CHECK-NEXT:   clauses:
 ! CHECK-NEXT:     - clause:          device
 ! CHECK-NEXT:       details:         '0'
 ! CHECK-NEXT: - file:            '{{[^"]*}}omp-device-constructs.f90'
-! CHECK-NEXT:   line:            30
+! CHECK-NEXT:   line:            28
 ! CHECK-NEXT:   construct:       target
 ! CHECK-NEXT:   clauses:
 ! CHECK-NEXT:     - clause:          defaultmap
 ! CHECK-NEXT:       details:         'tofrom:scalar'
 ! CHECK-NEXT: - file:            '{{[^"]*}}omp-device-constructs.f90'
-! CHECK-NEXT:   line:            36
+! CHECK-NEXT:   line:            34
 ! CHECK-NEXT:   construct:       teams
 ! CHECK-NEXT:   clauses:
 ! CHECK-NEXT:     - clause:          default
@@ -87,13 +85,13 @@
 ! CHECK-NEXT:     - clause:          thread_limit
 ! CHECK-NEXT:       details:         '10'
 ! CHECK-NEXT: - file:            '{{[^"]*}}omp-device-constructs.f90'
-! CHECK-NEXT:   line:            42
+! CHECK-NEXT:   line:            40
 ! CHECK-NEXT:   construct:       target
 ! CHECK-NEXT:   clauses:
 ! CHECK-NEXT:     - clause:          map
 ! CHECK-NEXT:       details:         'tofrom:a'
 ! CHECK-NEXT: - file:            '{{[^"]*}}omp-device-constructs.f90'
-! CHECK-NEXT:   line:            48
+! CHECK-NEXT:   line:            46
 ! CHECK-NEXT:   construct:       target data
 ! CHECK-NEXT:   clauses:
 ! CHECK-NEXT:     - clause:          device