diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py
--- a/buildbot/osuosl/master/config/builders.py
+++ b/buildbot/osuosl/master/config/builders.py
@@ -1615,6 +1615,27 @@
                         'LD': 'lld'
                     })},
 
+    {'name' : "flang-x86_64-windows",
+    'tags'  : ["flang"],
+    'workernames' : ["minipc-ryzen-win"],
+    'builddir': "flang-x86_64-windows",
+    'factory' : UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
+                    depends_on_projects=['llvm','mlir','clang','flang'],
+                    checks=['check-flang'],
+                    allow_test_fail=True,
+                    install_dir="flang.install",
+                    extra_configure_args=[
+                        "-DCLANG_ENABLE_STATIC_ANALYZER=OFF",
+                        "-DCLANG_ENABLE_ARCMT=OFF",
+                        "-DCLANG_ENABLE_OBJC_REWRITER=OFF",
+                        "-DLLVM_TARGETS_TO_BUILD=X86",
+                        "-DLLVM_INSTALL_UTILS=ON",
+                        "-DCMAKE_C_COMPILER=cl",
+                        "-DCMAKE_CXX_COMPILER=cl",
+                        "-DCMAKE_CXX_STANDARD=17",
+                        '-DLLVM_PARALLEL_COMPILE_JOBS=4',
+                    ])},
+
 # Builders responsible building Sphinix documentation.
 
     {'name' : "llvm-sphinx-docs",
diff --git a/buildbot/osuosl/master/config/workers.py b/buildbot/osuosl/master/config/workers.py
--- a/buildbot/osuosl/master/config/workers.py
+++ b/buildbot/osuosl/master/config/workers.py
@@ -227,6 +227,9 @@
         # Ubuntu 18.04.LTS x86_64, Intel(R) Xeon(R) CPU X3460 @ 2.80GHz, 32 GiB RAM
         create_worker("polly-x86_64-fdcserver", properties={'jobs': 8, 'loadaverage': 8}, max_builds=1),
 
+        # Windows 10, AMD Ryzen 5 PRO 4650G, 16 GiB RAM
+        create_worker("minipc-ryzen-win", properties={'jobs': 12}, max_builds=1),
+
         # Ubuntu 20.04.LTS x86_64, Intel(R) Core(TM) i5-9400F CPU @ 2.90Ghz, 16 GiB RAM, NVIDIA GeForce GTX 1050 Ti (Pascal, sm_61, 4GiB)
         create_worker("minipc-1050ti-linux", properties={'jobs': 6}, max_builds=1),
 
diff --git a/zorg/buildbot/builders/UnifiedTreeBuilder.py b/zorg/buildbot/builders/UnifiedTreeBuilder.py
--- a/zorg/buildbot/builders/UnifiedTreeBuilder.py
+++ b/zorg/buildbot/builders/UnifiedTreeBuilder.py
@@ -179,6 +179,7 @@
            install_dir = None,
            env = None,
            stage_name = None,
+           allow_test_fail = False,
            **kwargs):
 
     if obj_dir is None:
@@ -224,6 +225,8 @@
                                    "Test", "just", "built", "components", "for",
                                    check,
                                  ],
+                                 haltOnFailure=False,
+                                 flunkOnFailure=not allow_test_fail,
                                  env=check_env,
                                  workdir=obj_dir,
                                  **kwargs # Pass through all the extra arguments.
@@ -283,6 +286,7 @@
            clean = False,
            extra_configure_args = None,
            env = None,
+           allow_test_fail = False,
            **kwargs):
 
     # Make a local copy of the configure args, as we are going to modify that.
@@ -325,6 +329,7 @@
            checks=checks,
            install_dir=f.install_dir,
            env=merged_env,
+           allow_test_fail=allow_test_fail,
            **kwargs)
 
     return f