diff --git a/flang/test/Lower/OpenMP/taskwait.f90 b/flang/test/Lower/OpenMP/taskwait.f90
new file mode 100644
--- /dev/null
+++ b/flang/test/Lower/OpenMP/taskwait.f90
@@ -0,0 +1,12 @@
+!RUN: %flang_fc1 -emit-fir -fopenmp %s -o - | FileCheck %s --check-prefixes="FIRDialect,OMPDialect"
+!RUN: %flang_fc1 -emit-fir -fopenmp %s -o - | fir-opt --fir-to-llvm-ir | FileCheck %s --check-prefixes="OMPDialect"
+
+!FIRDialect-LABEL: @_QPomp_taskwait
+subroutine omp_taskwait
+  !OMPDialect: omp.taskwait
+  !$omp taskwait
+  !FIRDialect: fir.call @_QPfoo() : () -> ()
+  call foo()
+  !OMPDialect: omp.taskwait
+  !$omp taskwait
+end subroutine omp_taskwait
diff --git a/flang/test/Lower/OpenMP/taskyield.f90 b/flang/test/Lower/OpenMP/taskyield.f90
new file mode 100644
--- /dev/null
+++ b/flang/test/Lower/OpenMP/taskyield.f90
@@ -0,0 +1,12 @@
+!RUN: %flang_fc1 -emit-fir -fopenmp %s -o - | FileCheck %s --check-prefixes="FIRDialect,OMPDialect"
+!RUN: %flang_fc1 -emit-fir -fopenmp %s -o - | fir-opt --fir-to-llvm-ir | FileCheck %s --check-prefixes="OMPDialect"
+
+!FIRDialect-LABEL: @_QPomp_taskyield
+subroutine omp_taskyield
+  !OMPDialect: omp.taskyield
+  !$omp taskyield
+  !FIRDialect: fir.call @_QPfoo() : () -> ()
+  call foo()
+  !OMPDialect: omp.taskyield
+  !$omp taskyield
+end subroutine omp_taskyield