diff --git a/.circleci/config.yml b/.circleci/config.yml
index 23eb764a6c..68e6055ef1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -86,7 +86,6 @@ jobs:
   build-for-windows:
     executor:
       name: win/default
-      size: xlarge
     parameters:
       tasks:
         type: string
@@ -412,7 +411,21 @@ commands:
           paths:
             - tested-platforms
 workflows:
-  build-and-test:
+  test-build-system:
+    when:
+      or:
+        - matches:
+            pattern: "^main$"
+            value: << pipeline.git.branch >>
+        - matches:
+            pattern: "^master$"
+            value: << pipeline.git.branch >>
+        - matches:
+            pattern: "^develop$"
+            value: << pipeline.git.branch >>
+        - matches:
+            pattern: "^release/.*"
+            value: << pipeline.git.branch >>
     jobs:
       - setup-workspace:
           <<: *tag_filters
@@ -447,6 +460,8 @@ workflows:
             - build-for-windows
             - build-for-ubuntu
             - build-for-darwin
+  build-and-test:
+    jobs:
       - build-and-test:
           <<: *tag_filters
           context: