diff --git a/configs/mainnet/altair.yaml b/configs/mainnet/altair.yaml
index eb24eb2d7..e387fc87a 100644
--- a/configs/mainnet/altair.yaml
+++ b/configs/mainnet/altair.yaml
@@ -10,20 +10,20 @@ MIN_SLASHING_PENALTY_QUOTIENT_ALTAIR: 64
 PROPORTIONAL_SLASHING_MULTIPLIER_ALTAIR: 2
 
 
-# Misc
+# Sync committee
 # ---------------------------------------------------------------
 # 2**9 (= 512)
 SYNC_COMMITTEE_SIZE: 512
-# 2**2 (= 4)
-INACTIVITY_SCORE_BIAS: 4
-
-
-# Time parameters
-# ---------------------------------------------------------------
 # 2**9 (= 512)
 EPOCHS_PER_SYNC_COMMITTEE_PERIOD: 512
 
 
+# Misc
+# ---------------------------------------------------------------
+# 2**2 (= 4)
+INACTIVITY_SCORE_BIAS: 4
+
+
 # Signature domains
 # ---------------------------------------------------------------
 DOMAIN_SYNC_COMMITTEE: 0x07000000
diff --git a/configs/minimal/altair.yaml b/configs/minimal/altair.yaml
index af6c55d19..a66b5c7ca 100644
--- a/configs/minimal/altair.yaml
+++ b/configs/minimal/altair.yaml
@@ -10,20 +10,20 @@ MIN_SLASHING_PENALTY_QUOTIENT_ALTAIR: 64
 PROPORTIONAL_SLASHING_MULTIPLIER_ALTAIR: 2
 
 
-# Misc
+# Sync committee
 # ---------------------------------------------------------------
 # [customized]
 SYNC_COMMITTEE_SIZE: 32
-# 2**2 (= 4)
-INACTIVITY_SCORE_BIAS: 4
-
-
-# Time parameters
-# ---------------------------------------------------------------
 # [customized]
 EPOCHS_PER_SYNC_COMMITTEE_PERIOD: 8
 
 
+# Misc
+# ---------------------------------------------------------------
+# 2**2 (= 4)
+INACTIVITY_SCORE_BIAS: 4
+
+
 # Signature domains
 # ---------------------------------------------------------------
 DOMAIN_SYNC_COMMITTEE: 0x07000000
@@ -45,6 +45,7 @@ ALTAIR_FORK_EPOCH: 18446744073709551615
 MIN_SYNC_COMMITTEE_PARTICIPANTS: 1
 
 
+
 # Validator
 # ---------------------------------------------------------------
 # 2**2 (= 4)
diff --git a/specs/altair/beacon-chain.md b/specs/altair/beacon-chain.md
index ac4457b22..34a33469e 100644
--- a/specs/altair/beacon-chain.md
+++ b/specs/altair/beacon-chain.md
@@ -14,8 +14,8 @@
   - [Misc](#misc)
 - [Configuration](#configuration)
   - [Updated penalty values](#updated-penalty-values)
+  - [Sync committee](#sync-committee)
   - [Misc](#misc-1)
-  - [Time parameters](#time-parameters)
   - [Domain types](#domain-types)
 - [Containers](#containers)
   - [Modified containers](#modified-containers)
@@ -114,19 +114,19 @@ This patch updates a few configuration values to move penalty parameters closer
 | `MIN_SLASHING_PENALTY_QUOTIENT_ALTAIR` | `uint64(2**6)` (= 64) |
 | `PROPORTIONAL_SLASHING_MULTIPLIER_ALTAIR` | `uint64(2)` |
 
+### Sync committee
+
+| Name | Value | Unit | Duration |
+| - | - | - | - |
+| `SYNC_COMMITTEE_SIZE` | `uint64(2**9)` (= 512) | Validators | |
+| `EPOCHS_PER_SYNC_COMMITTEE_PERIOD` | `uint64(2**9)` (= 512) | epochs | ~54 hours |
+
 ### Misc
 
 | Name | Value |
 | - | - |
-| `SYNC_COMMITTEE_SIZE` | `uint64(2**9)` (= 512) |
 | `INACTIVITY_SCORE_BIAS` | `uint64(4)` |
 
-### Time parameters
-
-| Name | Value | Unit | Duration |
-| - | - | :-: | :-: |
-| `EPOCHS_PER_SYNC_COMMITTEE_PERIOD` | `uint64(2**9)` (= 512) | epochs | ~54 hours |
-
 ### Domain types
 
 | Name | Value |
diff --git a/tests/core/pyspec/eth2spec/test/altair/block_processing/test_process_sync_committee.py b/tests/core/pyspec/eth2spec/test/altair/block_processing/test_process_sync_committee.py
index 29b31c979..2e5d62d11 100644
--- a/tests/core/pyspec/eth2spec/test/altair/block_processing/test_process_sync_committee.py
+++ b/tests/core/pyspec/eth2spec/test/altair/block_processing/test_process_sync_committee.py
@@ -369,7 +369,7 @@ def test_valid_signature_future_committee(spec, state):
     yield from run_sync_committee_processing(spec, state, block)
 
 
-@with_all_phases_except([PHASE0])
+@with_altair_and_later
 @spec_state_test
 def test_sync_committee_is_only_computed_at_epoch_boundary(spec, state):
     """