3 files changed, 13 insertions, 0 deletions
diff --git a/openmp/runtime/test/lit.cfg b/openmp/runtime/test/lit.cfg
index 6316ae7481b..ac5f4469525 100644
--- a/openmp/runtime/test/lit.cfg
+++ b/openmp/runtime/test/lit.cfg
@@ -103,6 +103,9 @@ if config.libomp_omp_version >= 40:
 if 'Linux' in config.operating_system:
     config.available_features.add("linux")
 
+if config.operating_system == 'NetBSD':
+    config.available_features.add("netbsd")
+
 if config.operating_system in ['Linux', 'Windows']:
     config.available_features.add('affinity')
 
diff --git a/openmp/runtime/test/tasking/omp_taskloop_num_tasks.c b/openmp/runtime/test/tasking/omp_taskloop_num_tasks.c
index 75efea6e1c6..bed2c5b207e 100644
--- a/openmp/runtime/test/tasking/omp_taskloop_num_tasks.c
+++ b/openmp/runtime/test/tasking/omp_taskloop_num_tasks.c
@@ -1,3 +1,5 @@
+// This test is known to be fragile on NetBSD kernel at the moment.
+// UNSUPPORTED: netbsd
 // RUN: %libomp-compile-and-run
 // RUN: %libomp-compile && env KMP_TASKLOOP_MIN_TASKS=1 %libomp-run
 // REQUIRES: openmp-4.5
@@ -5,6 +7,10 @@
 // These compilers don't support the taskloop construct
 // UNSUPPORTED: gcc-4, gcc-5, icc-16
 
+// This test is known to be fragile on NetBSD kernel at the moment,
+// https://bugs.llvm.org/show_bug.cgi?id=42020.
+// UNSUPPORTED: netbsd
+
 /*
  * Test for taskloop
  * Method: caculate how many times the iteration space is dispatched
diff --git a/openmp/runtime/test/tasking/omp_taskwait.c b/openmp/runtime/test/tasking/omp_taskwait.c
index c3a0ea7ee60..584eceb5807 100644
--- a/openmp/runtime/test/tasking/omp_taskwait.c
+++ b/openmp/runtime/test/tasking/omp_taskwait.c
@@ -1,4 +1,8 @@
 // RUN: %libomp-compile-and-run
+
+// This test is known to be fragile on NetBSD kernel at the moment,
+// https://bugs.llvm.org/show_bug.cgi?id=42020.
+// UNSUPPORTED: netbsd
 #include <stdio.h>
 #include <math.h>
 #include "omp_testsuite.h"