diff --git a/python39.yaml b/python39.yaml
index 69324c8..3ceb974 100644
--- a/python39.yaml
+++ b/python39.yaml
@@ -66,9 +66,11 @@ data:
                 # # setuptools, pip, ...
                 # %_without_tests 1
 
-                # === Bootstrap phase 4 ===
+                # === Bootstrap phase 3 ===
                 #
                 # %python3_pkgversion 39
+                # # scipy needs pybind11 to build and pybind11 needs scipy for tests
+                # %_without_tests 1
 
 
             # Macros bootstrapping info:
@@ -83,11 +85,9 @@ data:
             #   therefore it's safer to just move them out of the macros
             #   section entirely to avoid possible issues.
             macros: |
-                # === Bootstrap phase 3 ===
+                # === Bootstrap phase 4 ===
                 #
                 %python3_pkgversion 39
-                # scipy needs pybind11 to build and pybind11 needs scipy for tests
-                %_without_tests 1
 
     components:
         rpms:
@@ -264,45 +264,45 @@ data:
             python-requests:
                 rationale: Python component
                 ref: stream-python39-3.9-rhel-8.9.0
-                buildorder: 10
+                # buildorder: 10
             numpy:
                 rationale: Python component
                 ref: stream-python39-3.9-rhel-8.9.0
-                buildorder: 10
+                # buildorder: 10
             PyYAML:
                 rationale: Python component
                 ref: stream-python39-3.9-rhel-8.9.0
-                buildorder: 10
+                # buildorder: 10
             python-pycparser:
                 rationale: Python component
                 ref: stream-python39-3.9-rhel-8.9.0
-                buildorder: 10
+                # buildorder: 10
             python-lxml:
                 rationale: Python component
                 ref: stream-python39-3.9-rhel-8.9.0
-                buildorder: 10
+                # buildorder: 10
             python-cffi:
                 rationale: Python component
                 ref: stream-python39-3.9-rhel-8.9.0
-                buildorder: 20
+                # buildorder: 20
             pybind11:
                 rationale: Python component
                 ref: stream-python39-3.9-rhel-8.9.0
                 # needs numpy
-                buildorder: 20
+                # buildorder: 20
             scipy:
                 rationale: Python component
                 ref: stream-python39-3.9-rhel-8.9.0
                 # needs pybind11
-                buildorder: 30
+                # buildorder: 30
             python-cryptography:
                 rationale: Python component
                 ref: stream-python39-3.9-rhel-8.9.0
                 # needs cffi
-                buildorder: 30
+                # buildorder: 30
             python-PyMySQL:
                 rationale: Python component
                 ref: stream-python39-3.9-rhel-8.9.0
                 # needs cryptography
-                buildorder: 40
+                # buildorder: 40
 ...