diff --git a/flang/test/Semantics/canondo08.f90 b/flang/test/Semantics/canondo08.f90
index 465982f03939..09a277b53d5a 100644
--- a/flang/test/Semantics/canondo08.f90
+++ b/flang/test/Semantics/canondo08.f90
@@ -1,4 +1,3 @@
-! RUN: %S/test_any.sh %s %t %f18
 ! Error test -- DO loop uses obsolete loop termination statement
 ! See R1131 and C1133
 
@@ -6,7 +5,7 @@
 ! A warning is generated with -Mstandard
 
 
-! EXEC: ${F18} -funparse-with-symbols -Mstandard %s 2>&1 | ${FileCheck} %s
+! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
@@ -15,7 +14,8 @@
 ! not want to see label do in the unparse only.
 ! CHECK-NOT: do [1-9]
 
-! CHECK: A DO loop should terminate with an END DO or CONTINUE
+! RUN: FileCheck --check-prefix=ERR --input-file=%t.stderr %s
+! ERR: A DO loop should terminate with an END DO or CONTINUE
 
 subroutine foo1()
   do 01 k=1,2
diff --git a/flang/test/Semantics/canondo09.f90 b/flang/test/Semantics/canondo09.f90
index 6c76ac2c1a68..6d9efd91f89c 100644
--- a/flang/test/Semantics/canondo09.f90
+++ b/flang/test/Semantics/canondo09.f90
@@ -1,12 +1,11 @@
-! RUN: %S/test_any.sh %s %t %f18
-! Error test -- DO loop uses obsolete loop termination statement
+! Error test -- DO loop uses obsolete loop termination statement (warning)
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
 ! A warning is generated with -Mstandard
 
 
-! EXEC: ${F18} -funparse-with-symbols -Mstandard %s 2>&1 | ${FileCheck} %s
+! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
@@ -15,7 +14,8 @@
 ! not want to see label do in the unparse only.
 ! CHECK-NOT: do [1-9]
 
-! CHECK: A DO loop should terminate with an END DO or CONTINUE
+! RUN: FileCheck --check-prefix=ERR --input-file=%t.stderr %s
+! ERR: A DO loop should terminate with an END DO or CONTINUE
 
 subroutine foo0()
   do  01 j=1,2
diff --git a/flang/test/Semantics/canondo10.f90 b/flang/test/Semantics/canondo10.f90
index adb658280e80..2733db6f7c61 100644
--- a/flang/test/Semantics/canondo10.f90
+++ b/flang/test/Semantics/canondo10.f90
@@ -1,12 +1,11 @@
-! RUN: %S/test_any.sh %s %t %f18
-! Error test -- DO loop uses obsolete loop termination statement
+! Error test -- DO loop uses obsolete loop termination statement (warning)
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
 ! A warning is generated with -Mstandard
 
 
-! EXEC: ${F18} -funparse-with-symbols -Mstandard %s 2>&1 | ${FileCheck} %s
+! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
@@ -15,7 +14,8 @@
 ! not want to see label do in the unparse only.
 ! CHECK-NOT: do [1-9]
 
-! CHECK: A DO loop should terminate with an END DO or CONTINUE
+! RUN: FileCheck --check-prefix=ERR --input-file=%t.stderr %s
+! ERR: A DO loop should terminate with an END DO or CONTINUE
 
 subroutine foo2()
   do 01 l=1,2
diff --git a/flang/test/Semantics/canondo11.f90 b/flang/test/Semantics/canondo11.f90
index 2ff61eb9682f..267e76ab34a7 100644
--- a/flang/test/Semantics/canondo11.f90
+++ b/flang/test/Semantics/canondo11.f90
@@ -1,12 +1,11 @@
-! RUN: %S/test_any.sh %s %t %f18
-! Error test -- DO loop uses obsolete loop termination statement
+! Error test -- DO loop uses obsolete loop termination statement (warning)
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
 ! A warning is generated with -Mstandard
 
 
-! EXEC: ${F18} -funparse-with-symbols -Mstandard %s 2>&1 | ${FileCheck} %s
+! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
@@ -15,7 +14,8 @@
 ! not want to see label do in the unparse only.
 ! CHECK-NOT: do [1-9]
 
-! CHECK: A DO loop should terminate with an END DO or CONTINUE
+! RUN: FileCheck --check-prefix=ERR --input-file=%t.stderr %s
+! ERR: A DO loop should terminate with an END DO or CONTINUE
 
 subroutine foo3()
   real :: a(10, 10), b(10, 10) = 1.0
diff --git a/flang/test/Semantics/canondo12.f90 b/flang/test/Semantics/canondo12.f90
index bbc73482342b..b3bc10cba02a 100644
--- a/flang/test/Semantics/canondo12.f90
+++ b/flang/test/Semantics/canondo12.f90
@@ -1,11 +1,10 @@
-! RUN: %S/test_any.sh %s %t %f18
-! Error test -- DO loop uses obsolete loop termination statement
+! Error test -- DO loop uses obsolete loop termination statement (warning)
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
 ! A warning is generated with -Mstandard
 
-! EXEC: ${F18} -funparse-with-symbols -Mstandard %s 2>&1 | ${FileCheck} %s
+! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
@@ -14,7 +13,8 @@
 ! not want to see label do in the unparse only.
 ! CHECK-NOT: do [1-9]
 
-! CHECK: A DO loop should terminate with an END DO or CONTINUE
+! RUN: FileCheck --check-prefix=ERR --input-file=%t.stderr %s
+! ERR: A DO loop should terminate with an END DO or CONTINUE
 
 subroutine foo4()
   real :: a(10, 10), b(10, 10) = 1.0
diff --git a/flang/test/Semantics/canondo13.f90 b/flang/test/Semantics/canondo13.f90
index a1278460017e..d75d8b96cebc 100644
--- a/flang/test/Semantics/canondo13.f90
+++ b/flang/test/Semantics/canondo13.f90
@@ -1,11 +1,10 @@
-! RUN: %S/test_any.sh %s %t %f18
-! Error test -- DO loop uses obsolete loop termination statement
+! Error test -- DO loop uses obsolete loop termination statement (warning)
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
 ! A warning is generated with -Mstandard
 
-! EXEC: ${F18} -funparse-with-symbols -Mstandard %s 2>&1 | ${FileCheck} %s
+! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
@@ -14,7 +13,8 @@
 ! not want to see label do in the unparse only.
 ! CHECK-NOT: do [1-9]
 
-! CHECK: A DO loop should terminate with an END DO or CONTINUE
+! RUN: FileCheck --check-prefix=ERR --input-file=%t.stderr %s
+! ERR: A DO loop should terminate with an END DO or CONTINUE
 
 subroutine foo5()
   real :: a(10, 10), b(10, 10) = 1.0
diff --git a/flang/test/Semantics/canondo14.f90 b/flang/test/Semantics/canondo14.f90
index c504468a0a03..99a3d25360db 100644
--- a/flang/test/Semantics/canondo14.f90
+++ b/flang/test/Semantics/canondo14.f90
@@ -1,11 +1,10 @@
-! RUN: %S/test_any.sh %s %t %f18
-! Error test -- DO loop uses obsolete loop termination statement
+! Error test -- DO loop uses obsolete loop termination statement (warning)
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
 ! A warning is generated with -Mstandard
 
-! EXEC: ${F18} -funparse-with-symbols -Mstandard %s 2>&1 | ${FileCheck} %s
+! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
@@ -14,7 +13,8 @@
 ! not want to see label do in the unparse only.
 ! CHECK-NOT: do [1-9]
 
-! CHECK: A DO loop should terminate with an END DO or CONTINUE
+! RUN: FileCheck --check-prefix=ERR --input-file=%t.stderr %s
+! ERR: A DO loop should terminate with an END DO or CONTINUE
 
 subroutine foo6(a)
   type whatever
diff --git a/flang/test/Semantics/canondo15.f90 b/flang/test/Semantics/canondo15.f90
index 6b52769d8c4a..059f06ce6409 100644
--- a/flang/test/Semantics/canondo15.f90
+++ b/flang/test/Semantics/canondo15.f90
@@ -1,11 +1,10 @@
-! RUN: %S/test_any.sh %s %t %f18
-! Error test -- DO loop uses obsolete loop termination statement
+! Error test -- DO loop uses obsolete loop termination statement (warning)
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
 ! A warning is generated with -Mstandard
 
-! EXEC: ${F18} -funparse-with-symbols -Mstandard %s 2>&1 | ${FileCheck} %s
+! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
@@ -14,7 +13,8 @@
 ! not want to see label do in the unparse only.
 ! CHECK-NOT: do [1-9]
 
-! CHECK: A DO loop should terminate with an END DO or CONTINUE
+! RUN: FileCheck --check-prefix=ERR --input-file=%t.stderr %s
+! ERR: A DO loop should terminate with an END DO or CONTINUE
 
 subroutine foo7(a)
   integer :: a(..)
diff --git a/flang/test/Semantics/canondo16.f90 b/flang/test/Semantics/canondo16.f90
index a8dfc91fa011..e455fa32b227 100644
--- a/flang/test/Semantics/canondo16.f90
+++ b/flang/test/Semantics/canondo16.f90
@@ -1,11 +1,10 @@
-! RUN: %S/test_any.sh %s %t %f18
-! Error test -- DO loop uses obsolete loop termination statement
+! Error test -- DO loop uses obsolete loop termination statement (warning)
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
 ! A warning is generated with -Mstandard
 
-! EXEC: ${F18} -funparse-with-symbols -Mstandard %s 2>&1 | ${FileCheck} %s
+! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
@@ -14,7 +13,8 @@
 ! not want to see label do in the unparse only.
 ! CHECK-NOT: do [1-9]
 
-! CHECK: A DO loop should terminate with an END DO or CONTINUE
+! RUN: FileCheck --check-prefix=ERR --input-file=%t.stderr %s
+! ERR: A DO loop should terminate with an END DO or CONTINUE
 
 subroutine foo8()
   use iso_fortran_env, only : team_type
diff --git a/flang/test/Semantics/canondo17.f90 b/flang/test/Semantics/canondo17.f90
index c5e87e266efe..6edc67c705b1 100644
--- a/flang/test/Semantics/canondo17.f90
+++ b/flang/test/Semantics/canondo17.f90
@@ -1,11 +1,10 @@
-! RUN: %S/test_any.sh %s %t %f18
-! Error test -- DO loop uses obsolete loop termination statement
+! Error test -- DO loop uses obsolete loop termination statement (warning)
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
 ! A warning is generated with -Mstandard
 
-! EXEC: ${F18} -funparse-with-symbols -Mstandard %s 2>&1 | ${FileCheck} %s
+! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
@@ -14,7 +13,8 @@
 ! not want to see label do in the unparse only.
 ! CHECK-NOT: do [1-9]
 
-! CHECK: A DO loop should terminate with an END DO or CONTINUE
+! RUN: FileCheck --check-prefix=ERR --input-file=%t.stderr %s
+! ERR: A DO loop should terminate with an END DO or CONTINUE
 
 subroutine foo9()
   real :: a(10, 10), b(10, 10) = 1.0
diff --git a/flang/test/Semantics/canondo18.f90 b/flang/test/Semantics/canondo18.f90
index d5b18e3e1b4d..dd9c046e5be6 100644
--- a/flang/test/Semantics/canondo18.f90
+++ b/flang/test/Semantics/canondo18.f90
@@ -1,11 +1,10 @@
-! RUN: %S/test_any.sh %s %t %f18
-! Error test -- DO loop uses obsolete loop termination statement
+! Error test -- DO loop uses obsolete loop termination statement (warning)
 ! See R1131 and C1133
 
 ! By default, this is not an error and label do are rewritten to non-label do.
 ! A warning is generated with -Mstandard
 
-! EXEC: ${F18} -funparse-with-symbols -Mstandard %s 2>&1 | ${FileCheck} %s
+! RUN: %f18 -funparse-with-symbols -Mstandard %s 2>%t.stderr | FileCheck %s
 
 ! CHECK: end do
 
@@ -14,7 +13,8 @@
 ! not want to see label do in the unparse only.
 ! CHECK-NOT: do [1-9]
 
-! CHECK: A DO loop should terminate with an END DO or CONTINUE
+! RUN: FileCheck --check-prefix=ERR --input-file=%t.stderr %s
+! ERR: A DO loop should terminate with an END DO or CONTINUE
 
 subroutine foo10()
   real :: a(10, 10), b(10, 10) = 1.0