Index: runtime/test/lit.cfg
===================================================================
--- runtime/test/lit.cfg
+++ runtime/test/lit.cfg
@@ -92,6 +92,18 @@
     # for callback.h
     config.test_cflags += " -I " + config.test_source_root + "/ompt"
 
+if re.search('clang', config.test_compiler) is not None or re.search('icc', config.test_compiler) is not None:
+    config.available_features.add("cancel")
+    config.available_features.add("taskgroup")
+    config.available_features.add("dependences")
+    config.available_features.add("flush")
+    config.available_features.add("taskyield")
+    config.available_features.add("master_callback")
+    config.available_features.add("single_callback")
+
+if 'Linux' in config.operating_system:
+    config.available_features.add("linux")
+
 # substitutions
 if config.has_ompt:
     config.substitutions.append(("FileCheck", config.test_filecheck))