diff --git a/changelog.d/fix-sstb-self-employment-consumers.fixed.md b/changelog.d/fix-sstb-self-employment-consumers.fixed.md
new file mode 100644
index 00000000000..e169e90957f
--- /dev/null
+++ b/changelog.d/fix-sstb-self-employment-consumers.fixed.md
@@ -0,0 +1 @@
+Count SSTB self-employment income in Social Security, state and benefit income definitions, and mixed-category QBID allocation.
diff --git a/policyengine_us/parameters/gov/hhs/tanf/cash/income/sources/earned.yaml b/policyengine_us/parameters/gov/hhs/tanf/cash/income/sources/earned.yaml
index b8737093a8d..4cbcb04ffe9 100644
--- a/policyengine_us/parameters/gov/hhs/tanf/cash/income/sources/earned.yaml
+++ b/policyengine_us/parameters/gov/hhs/tanf/cash/income/sources/earned.yaml
@@ -3,6 +3,7 @@ values:
   2010-07-01:
     - employment_income_before_lsr
     - self_employment_income_before_lsr
+    - sstb_self_employment_income_before_lsr
 metadata:
   unit: list
   period: year
diff --git a/policyengine_us/parameters/gov/local/ca/ala/general_assistance/countable_income/sources.yaml b/policyengine_us/parameters/gov/local/ca/ala/general_assistance/countable_income/sources.yaml
index e1a28a50d15..e0e037067d4 100644
--- a/policyengine_us/parameters/gov/local/ca/ala/general_assistance/countable_income/sources.yaml
+++ b/policyengine_us/parameters/gov/local/ca/ala/general_assistance/countable_income/sources.yaml
@@ -3,6 +3,7 @@ values:
   2024-01-01:
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - social_security
     - unemployment_compensation
     - veterans_benefits
diff --git a/policyengine_us/parameters/gov/local/ca/la/dwp/ez_save/income_sources.yaml b/policyengine_us/parameters/gov/local/ca/la/dwp/ez_save/income_sources.yaml
index ab12afb7988..934d141459e 100644
--- a/policyengine_us/parameters/gov/local/ca/la/dwp/ez_save/income_sources.yaml
+++ b/policyengine_us/parameters/gov/local/ca/la/dwp/ez_save/income_sources.yaml
@@ -11,6 +11,7 @@ values:
   2022-01-01:
     - irs_employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - child_support_received
     - alimony_income
     - social_security
diff --git a/policyengine_us/parameters/gov/local/ca/la/general_relief/income_sources.yaml b/policyengine_us/parameters/gov/local/ca/la/general_relief/income_sources.yaml
index 4571be81d87..5406060c67f 100644
--- a/policyengine_us/parameters/gov/local/ca/la/general_relief/income_sources.yaml
+++ b/policyengine_us/parameters/gov/local/ca/la/general_relief/income_sources.yaml
@@ -9,6 +9,7 @@ values:
     # Income from a job of any type.
     - irs_employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - ssi
     - social_security
     - tanf
diff --git a/policyengine_us/parameters/gov/local/ca/riv/cap/liheap/countable_income/sources.yaml b/policyengine_us/parameters/gov/local/ca/riv/cap/liheap/countable_income/sources.yaml
index e1381741041..4af53d25288 100644
--- a/policyengine_us/parameters/gov/local/ca/riv/cap/liheap/countable_income/sources.yaml
+++ b/policyengine_us/parameters/gov/local/ca/riv/cap/liheap/countable_income/sources.yaml
@@ -3,6 +3,7 @@ values:
   2024-01-01:
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - alimony_income
     - child_support_received
     - pension_income
diff --git a/policyengine_us/parameters/gov/local/ca/riv/cap/share/countable_income/sources.yaml b/policyengine_us/parameters/gov/local/ca/riv/cap/share/countable_income/sources.yaml
index aa83053644e..adde7842456 100644
--- a/policyengine_us/parameters/gov/local/ca/riv/cap/share/countable_income/sources.yaml
+++ b/policyengine_us/parameters/gov/local/ca/riv/cap/share/countable_income/sources.yaml
@@ -3,6 +3,7 @@ values:
   2024-01-01:
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - alimony_income
     - child_support_received
     - pension_income
diff --git a/policyengine_us/parameters/gov/local/ca/riv/general_relief/income/sources/earned.yaml b/policyengine_us/parameters/gov/local/ca/riv/general_relief/income/sources/earned.yaml
index bff3bde3bd5..0d2a000ff5e 100644
--- a/policyengine_us/parameters/gov/local/ca/riv/general_relief/income/sources/earned.yaml
+++ b/policyengine_us/parameters/gov/local/ca/riv/general_relief/income/sources/earned.yaml
@@ -3,6 +3,7 @@ values:
   2020-01-01:
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - rental_income  # Income In-Kind
     # interests in real or individual property
     # training payments or work allowance
diff --git a/policyengine_us/parameters/gov/local/co/denver/dhs/property_tax_relief/income_sources.yaml b/policyengine_us/parameters/gov/local/co/denver/dhs/property_tax_relief/income_sources.yaml
index 07d1ab63a19..4363f021253 100644
--- a/policyengine_us/parameters/gov/local/co/denver/dhs/property_tax_relief/income_sources.yaml
+++ b/policyengine_us/parameters/gov/local/co/denver/dhs/property_tax_relief/income_sources.yaml
@@ -3,6 +3,7 @@ values:
   2023-01-01:
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - alimony_income
     - rental_income
     - disability_benefits
diff --git a/policyengine_us/parameters/gov/ssa/ssi/income/sources/earned.yaml b/policyengine_us/parameters/gov/ssa/ssi/income/sources/earned.yaml
index fdeff141a5b..f4701537b0f 100644
--- a/policyengine_us/parameters/gov/ssa/ssi/income/sources/earned.yaml
+++ b/policyengine_us/parameters/gov/ssa/ssi/income/sources/earned.yaml
@@ -3,6 +3,7 @@ values:
   1975-01-01:
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
 metadata:
   label: SSI earned income sources
   reference:
diff --git a/policyengine_us/parameters/gov/states/al/tax/income/agi/gross_income_sources.yaml b/policyengine_us/parameters/gov/states/al/tax/income/agi/gross_income_sources.yaml
index 07c0249712f..23766cf3f74 100644
--- a/policyengine_us/parameters/gov/states/al/tax/income/agi/gross_income_sources.yaml
+++ b/policyengine_us/parameters/gov/states/al/tax/income/agi/gross_income_sources.yaml
@@ -3,6 +3,7 @@ values:
   2021-01-01:
     - irs_employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - interest_income
     - dividend_income
     - alimony_income
diff --git a/policyengine_us/parameters/gov/states/ar/tax/income/gross_income/sources/individual.yaml b/policyengine_us/parameters/gov/states/ar/tax/income/gross_income/sources/individual.yaml
index 965cf02da7b..0fa4eeaa0ef 100644
--- a/policyengine_us/parameters/gov/states/ar/tax/income/gross_income/sources/individual.yaml
+++ b/policyengine_us/parameters/gov/states/ar/tax/income/gross_income/sources/individual.yaml
@@ -3,6 +3,7 @@ values:
   2021-01-01:
     - irs_employment_income # Line 8
     - self_employment_income # Line 8
+    - sstb_self_employment_income
     - interest_income # Line 10
     - dividend_income # Line 11
     - alimony_income # Line 12
diff --git a/policyengine_us/parameters/gov/states/ar/tax/income/gross_income/sources/joint.yaml b/policyengine_us/parameters/gov/states/ar/tax/income/gross_income/sources/joint.yaml
index 51526392197..ddcf7ad540d 100644
--- a/policyengine_us/parameters/gov/states/ar/tax/income/gross_income/sources/joint.yaml
+++ b/policyengine_us/parameters/gov/states/ar/tax/income/gross_income/sources/joint.yaml
@@ -3,6 +3,7 @@ values:
   2021-01-01:
     - irs_employment_income # Line 8
     - self_employment_income # Line 8
+    - sstb_self_employment_income
     - interest_income # Line 10
     - dividend_income # Line 11
     - alimony_income # Line 12
diff --git a/policyengine_us/parameters/gov/states/ca/cdss/child_care/income/sources.yaml b/policyengine_us/parameters/gov/states/ca/cdss/child_care/income/sources.yaml
index 6ae15ea404e..3803425d6d0 100644
--- a/policyengine_us/parameters/gov/states/ca/cdss/child_care/income/sources.yaml
+++ b/policyengine_us/parameters/gov/states/ca/cdss/child_care/income/sources.yaml
@@ -5,6 +5,7 @@ values:
     # Earned income
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
     # Public assistance
     - ca_tanf
     # Unemployment and disability
diff --git a/policyengine_us/parameters/gov/states/ca/cdss/tanf/cash/income/sources/earned.yaml b/policyengine_us/parameters/gov/states/ca/cdss/tanf/cash/income/sources/earned.yaml
index 2e6cfbe8c22..e19b6d53acc 100644
--- a/policyengine_us/parameters/gov/states/ca/cdss/tanf/cash/income/sources/earned.yaml
+++ b/policyengine_us/parameters/gov/states/ca/cdss/tanf/cash/income/sources/earned.yaml
@@ -12,3 +12,4 @@ values:
   2017-12-20:
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
diff --git a/policyengine_us/parameters/gov/states/ca/cpuc/income_sources.yaml b/policyengine_us/parameters/gov/states/ca/cpuc/income_sources.yaml
index b5df665562b..428b19a1305 100644
--- a/policyengine_us/parameters/gov/states/ca/cpuc/income_sources.yaml
+++ b/policyengine_us/parameters/gov/states/ca/cpuc/income_sources.yaml
@@ -14,6 +14,7 @@ values:
   - employment_income
   # Self-employment
   - self_employment_income
+  - sstb_self_employment_income
   - partnership_s_corp_income
   - farm_income
   # Interest
diff --git a/policyengine_us/parameters/gov/states/co/ccap/income/countable_income/sources.yaml b/policyengine_us/parameters/gov/states/co/ccap/income/countable_income/sources.yaml
index e8c73e3eca8..e19bcd394e4 100644
--- a/policyengine_us/parameters/gov/states/co/ccap/income/countable_income/sources.yaml
+++ b/policyengine_us/parameters/gov/states/co/ccap/income/countable_income/sources.yaml
@@ -4,6 +4,7 @@ values:
     # Earned income
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - farm_income
     # Unearned income
     - social_security
diff --git a/policyengine_us/parameters/gov/states/co/cdhs/tanf/income/earned.yaml b/policyengine_us/parameters/gov/states/co/cdhs/tanf/income/earned.yaml
index 81299906f09..afb284e06c6 100644
--- a/policyengine_us/parameters/gov/states/co/cdhs/tanf/income/earned.yaml
+++ b/policyengine_us/parameters/gov/states/co/cdhs/tanf/income/earned.yaml
@@ -3,6 +3,7 @@ values:
   2010-01-01:
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
 metadata:
   unit: list
   period: month
diff --git a/policyengine_us/parameters/gov/states/ct/oec/c4k/income/earned_sources.yaml b/policyengine_us/parameters/gov/states/ct/oec/c4k/income/earned_sources.yaml
index 22490fd3601..a7dc7f46952 100644
--- a/policyengine_us/parameters/gov/states/ct/oec/c4k/income/earned_sources.yaml
+++ b/policyengine_us/parameters/gov/states/ct/oec/c4k/income/earned_sources.yaml
@@ -3,6 +3,7 @@ values:
   2020-01-01:
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - farm_income
 
 metadata:
diff --git a/policyengine_us/parameters/gov/states/dc/dhs/ccsp/income/countable_income/sources.yaml b/policyengine_us/parameters/gov/states/dc/dhs/ccsp/income/countable_income/sources.yaml
index ab1daf1bfae..13156a90b92 100644
--- a/policyengine_us/parameters/gov/states/dc/dhs/ccsp/income/countable_income/sources.yaml
+++ b/policyengine_us/parameters/gov/states/dc/dhs/ccsp/income/countable_income/sources.yaml
@@ -3,6 +3,7 @@ values:
   2020-01-01:
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - dividend_income
     - interest_income 
     - rental_income
diff --git a/policyengine_us/parameters/gov/states/dc/dhs/tanf/income/sources/earned.yaml b/policyengine_us/parameters/gov/states/dc/dhs/tanf/income/sources/earned.yaml
index 6697515dbe0..7002cf831ad 100644
--- a/policyengine_us/parameters/gov/states/dc/dhs/tanf/income/sources/earned.yaml
+++ b/policyengine_us/parameters/gov/states/dc/dhs/tanf/income/sources/earned.yaml
@@ -3,6 +3,7 @@ values:
   2001-01-01:
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
 metadata:
   unit: list
   period: year
diff --git a/policyengine_us/parameters/gov/states/de/dss/poc/income/countable_income/sources.yaml b/policyengine_us/parameters/gov/states/de/dss/poc/income/countable_income/sources.yaml
index 382644afe9a..0a4bc293eed 100644
--- a/policyengine_us/parameters/gov/states/de/dss/poc/income/countable_income/sources.yaml
+++ b/policyengine_us/parameters/gov/states/de/dss/poc/income/countable_income/sources.yaml
@@ -3,6 +3,7 @@ values:
   2024-01-01:
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - social_security_retirement
     - social_security_disability
     - social_security_survivors
diff --git a/policyengine_us/parameters/gov/states/ia/tax/income/gross_income/sources.yaml b/policyengine_us/parameters/gov/states/ia/tax/income/gross_income/sources.yaml
index ba8f1b7b663..8525f54bfd6 100644
--- a/policyengine_us/parameters/gov/states/ia/tax/income/gross_income/sources.yaml
+++ b/policyengine_us/parameters/gov/states/ia/tax/income/gross_income/sources.yaml
@@ -6,6 +6,7 @@ values:
     - dividend_income
     - alimony_income
     - self_employment_income
+    - sstb_self_employment_income
     - capital_gains
     - taxable_pension_income
     - partnership_s_corp_income
diff --git a/policyengine_us/parameters/gov/states/il/dhs/aabd/income/sources/earned.yaml b/policyengine_us/parameters/gov/states/il/dhs/aabd/income/sources/earned.yaml
index 4a05847be83..443f7dfe142 100644
--- a/policyengine_us/parameters/gov/states/il/dhs/aabd/income/sources/earned.yaml
+++ b/policyengine_us/parameters/gov/states/il/dhs/aabd/income/sources/earned.yaml
@@ -3,6 +3,7 @@ values:
   2021-01-01:
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - rental_income
  
 metadata:
diff --git a/policyengine_us/parameters/gov/states/il/dhs/ccap/income/countable_income/sources.yaml b/policyengine_us/parameters/gov/states/il/dhs/ccap/income/countable_income/sources.yaml
index 40e5ea35e5b..4e74faa18a3 100644
--- a/policyengine_us/parameters/gov/states/il/dhs/ccap/income/countable_income/sources.yaml
+++ b/policyengine_us/parameters/gov/states/il/dhs/ccap/income/countable_income/sources.yaml
@@ -3,6 +3,7 @@ values:
   2020-01-01:
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - rental_income
     - dividend_income
     - interest_income
diff --git a/policyengine_us/parameters/gov/states/il/dhs/tanf/income/sources/earned.yaml b/policyengine_us/parameters/gov/states/il/dhs/tanf/income/sources/earned.yaml
index a7b4ccaff18..37337b34437 100644
--- a/policyengine_us/parameters/gov/states/il/dhs/tanf/income/sources/earned.yaml
+++ b/policyengine_us/parameters/gov/states/il/dhs/tanf/income/sources/earned.yaml
@@ -3,6 +3,7 @@ values:
   1997-07-01:
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - rental_income
 metadata:
   unit: list
diff --git a/policyengine_us/parameters/gov/states/il/hfs/hbwd/eligibility/income/sources/earned.yaml b/policyengine_us/parameters/gov/states/il/hfs/hbwd/eligibility/income/sources/earned.yaml
index a37c739cbb5..b84f4da872d 100644
--- a/policyengine_us/parameters/gov/states/il/hfs/hbwd/eligibility/income/sources/earned.yaml
+++ b/policyengine_us/parameters/gov/states/il/hfs/hbwd/eligibility/income/sources/earned.yaml
@@ -3,6 +3,7 @@ values:
   2022-04-01:
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - rental_income
 
 metadata:
diff --git a/policyengine_us/parameters/gov/states/il/isbe/income/countable_sources.yaml b/policyengine_us/parameters/gov/states/il/isbe/income/countable_sources.yaml
index 7d664ce4c03..711fac9039b 100644
--- a/policyengine_us/parameters/gov/states/il/isbe/income/countable_sources.yaml
+++ b/policyengine_us/parameters/gov/states/il/isbe/income/countable_sources.yaml
@@ -4,6 +4,7 @@ values:
     # Earned income
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
     # Unearned income included per ISBE Household and Income Form
     - child_support_received
     - alimony_income
diff --git a/policyengine_us/parameters/gov/states/ma/dta/tcap/gross_income/earned.yaml b/policyengine_us/parameters/gov/states/ma/dta/tcap/gross_income/earned.yaml
index 5277349dad5..99de2f0669f 100644
--- a/policyengine_us/parameters/gov/states/ma/dta/tcap/gross_income/earned.yaml
+++ b/policyengine_us/parameters/gov/states/ma/dta/tcap/gross_income/earned.yaml
@@ -3,6 +3,7 @@ values:
   2000-01-01:
     - employment_income_before_lsr
     - self_employment_income_before_lsr
+    - sstb_self_employment_income_before_lsr
 
 metadata:
   unit: list
diff --git a/policyengine_us/parameters/gov/states/ma/eec/ccfa/income/countable_income/sources.yaml b/policyengine_us/parameters/gov/states/ma/eec/ccfa/income/countable_income/sources.yaml
index 64ae4e2207e..2d917c304cf 100644
--- a/policyengine_us/parameters/gov/states/ma/eec/ccfa/income/countable_income/sources.yaml
+++ b/policyengine_us/parameters/gov/states/ma/eec/ccfa/income/countable_income/sources.yaml
@@ -3,6 +3,7 @@ values:
   2020-01-01:
     - employment_income_before_lsr
     - self_employment_income_before_lsr
+    - sstb_self_employment_income_before_lsr
     - dividend_income
     - interest_income
     - rental_income
diff --git a/policyengine_us/parameters/gov/states/me/dhhs/ccap/income/countable_income/sources.yaml b/policyengine_us/parameters/gov/states/me/dhhs/ccap/income/countable_income/sources.yaml
index 26d2680f84a..71fb9d25d7d 100644
--- a/policyengine_us/parameters/gov/states/me/dhhs/ccap/income/countable_income/sources.yaml
+++ b/policyengine_us/parameters/gov/states/me/dhhs/ccap/income/countable_income/sources.yaml
@@ -4,6 +4,7 @@ values:
     # Earned income (Rule §2.C.3)
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - farm_income
     - rental_income
     # Unearned income (Rule §2.C.4)
diff --git a/policyengine_us/parameters/gov/states/mn/tax/income/credits/marriage/income_sources.yaml b/policyengine_us/parameters/gov/states/mn/tax/income/credits/marriage/income_sources.yaml
index 03d3e92a826..81718dedad5 100644
--- a/policyengine_us/parameters/gov/states/mn/tax/income/credits/marriage/income_sources.yaml
+++ b/policyengine_us/parameters/gov/states/mn/tax/income/credits/marriage/income_sources.yaml
@@ -3,6 +3,7 @@ values:
   2021-01-01:
     - irs_employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - taxable_social_security
     - taxable_pension_income
 
diff --git a/policyengine_us/parameters/gov/states/ms/tax/income/income_sources.yaml b/policyengine_us/parameters/gov/states/ms/tax/income/income_sources.yaml
index ddda03874d5..125d776b09f 100644
--- a/policyengine_us/parameters/gov/states/ms/tax/income/income_sources.yaml
+++ b/policyengine_us/parameters/gov/states/ms/tax/income/income_sources.yaml
@@ -3,6 +3,7 @@ values:
   2021-01-01:
     - irs_employment_income # Wages, salaries, tips, etc.
     - self_employment_income
+    - sstb_self_employment_income
     - partnership_s_corp_income
     - loss_limited_net_capital_gains_person
     - rental_income
diff --git a/policyengine_us/parameters/gov/states/mt/dhs/tanf/income/sources/earned.yaml b/policyengine_us/parameters/gov/states/mt/dhs/tanf/income/sources/earned.yaml
index fee2d7bf1ee..c6de5094258 100644
--- a/policyengine_us/parameters/gov/states/mt/dhs/tanf/income/sources/earned.yaml
+++ b/policyengine_us/parameters/gov/states/mt/dhs/tanf/income/sources/earned.yaml
@@ -3,6 +3,7 @@ values:
   1997-02-01:
     - employment_income_before_lsr
     - self_employment_income_before_lsr
+    - sstb_self_employment_income_before_lsr
 metadata:
   unit: list
   period: year
diff --git a/policyengine_us/parameters/gov/states/nc/ncdhhs/scca/income/sources.yaml b/policyengine_us/parameters/gov/states/nc/ncdhhs/scca/income/sources.yaml
index 6047622a5ab..d92cb5b9e10 100644
--- a/policyengine_us/parameters/gov/states/nc/ncdhhs/scca/income/sources.yaml
+++ b/policyengine_us/parameters/gov/states/nc/ncdhhs/scca/income/sources.yaml
@@ -4,6 +4,7 @@ values:
   2024-08-01:
   - employment_income
   - self_employment_income
+  - sstb_self_employment_income
   - pension_income
   - veterans_benefits
   - unemployment_compensation
diff --git a/policyengine_us/parameters/gov/states/nc/ncdhhs/tanf/income/earned.yaml b/policyengine_us/parameters/gov/states/nc/ncdhhs/tanf/income/earned.yaml
index 6a75da45f39..5bd8698ea29 100644
--- a/policyengine_us/parameters/gov/states/nc/ncdhhs/tanf/income/earned.yaml
+++ b/policyengine_us/parameters/gov/states/nc/ncdhhs/tanf/income/earned.yaml
@@ -4,6 +4,7 @@ values:
   1997-01-01:
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
 metadata:
   unit: list
   period: year
diff --git a/policyengine_us/parameters/gov/states/nh/dhhs/ccap/income/countable_income/sources.yaml b/policyengine_us/parameters/gov/states/nh/dhhs/ccap/income/countable_income/sources.yaml
index 5512db76d83..6922052add5 100644
--- a/policyengine_us/parameters/gov/states/nh/dhhs/ccap/income/countable_income/sources.yaml
+++ b/policyengine_us/parameters/gov/states/nh/dhhs/ccap/income/countable_income/sources.yaml
@@ -4,6 +4,7 @@ values:
     # Earned income
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - farm_income
     # Unearned income
     - social_security
diff --git a/policyengine_us/parameters/gov/states/nj/njdhs/ccap/income/countable_income/earned_sources.yaml b/policyengine_us/parameters/gov/states/nj/njdhs/ccap/income/countable_income/earned_sources.yaml
index 12b2a29635b..627b7c10d5e 100644
--- a/policyengine_us/parameters/gov/states/nj/njdhs/ccap/income/countable_income/earned_sources.yaml
+++ b/policyengine_us/parameters/gov/states/nj/njdhs/ccap/income/countable_income/earned_sources.yaml
@@ -3,6 +3,7 @@ values:
   2024-01-01:
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
 
 metadata:
   unit: list
diff --git a/policyengine_us/parameters/gov/states/nj/tax/income/gross_income/loss_eligible_categories/category_b.yaml b/policyengine_us/parameters/gov/states/nj/tax/income/gross_income/loss_eligible_categories/category_b.yaml
index ab80893a7a1..a433427659a 100644
--- a/policyengine_us/parameters/gov/states/nj/tax/income/gross_income/loss_eligible_categories/category_b.yaml
+++ b/policyengine_us/parameters/gov/states/nj/tax/income/gross_income/loss_eligible_categories/category_b.yaml
@@ -2,6 +2,7 @@ description: New Jersey combines self-employment and farm income into Category (
 values:
   2021-01-01:
     - self_employment_income  # Line 18: Net business profits
+    - sstb_self_employment_income
     - farm_income  # Line 18: Farm income
 metadata:
   unit: list
diff --git a/policyengine_us/parameters/gov/states/nm/tax/income/modified_gross_income.yaml b/policyengine_us/parameters/gov/states/nm/tax/income/modified_gross_income.yaml
index 011d26cadf3..1dd0c8fd02d 100644
--- a/policyengine_us/parameters/gov/states/nm/tax/income/modified_gross_income.yaml
+++ b/policyengine_us/parameters/gov/states/nm/tax/income/modified_gross_income.yaml
@@ -14,6 +14,7 @@ values:
     - unemployment_compensation
     - irs_employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - veterans_benefits
     # income such as gambling winnings, insurance settlements, scholarships,
     # grants, trust income and inheritance,
diff --git a/policyengine_us/parameters/gov/states/ok/tax/income/credits/gross_income_sources.yaml b/policyengine_us/parameters/gov/states/ok/tax/income/credits/gross_income_sources.yaml
index ace8847079a..07ad10f741c 100644
--- a/policyengine_us/parameters/gov/states/ok/tax/income/credits/gross_income_sources.yaml
+++ b/policyengine_us/parameters/gov/states/ok/tax/income/credits/gross_income_sources.yaml
@@ -3,6 +3,7 @@ values:
   2021-01-01:
     - irs_employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - partnership_s_corp_income
     - farm_income
     - farm_rent_income
diff --git a/policyengine_us/parameters/gov/states/pa/dhs/ccw/income/countable_income/sources.yaml b/policyengine_us/parameters/gov/states/pa/dhs/ccw/income/countable_income/sources.yaml
index 24e0e29aac7..c84001e2836 100644
--- a/policyengine_us/parameters/gov/states/pa/dhs/ccw/income/countable_income/sources.yaml
+++ b/policyengine_us/parameters/gov/states/pa/dhs/ccw/income/countable_income/sources.yaml
@@ -3,6 +3,7 @@ values:
   2023-12-16:
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - social_security
     - social_security_disability
     - social_security_survivors
diff --git a/policyengine_us/parameters/gov/states/ri/dhs/ccap/income/countable_income/sources.yaml b/policyengine_us/parameters/gov/states/ri/dhs/ccap/income/countable_income/sources.yaml
index 718a1dd10f4..480a264061f 100644
--- a/policyengine_us/parameters/gov/states/ri/dhs/ccap/income/countable_income/sources.yaml
+++ b/policyengine_us/parameters/gov/states/ri/dhs/ccap/income/countable_income/sources.yaml
@@ -3,6 +3,7 @@ values:
   2020-01-01:
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - social_security_retirement
     - social_security_disability
     - social_security_survivors
diff --git a/policyengine_us/parameters/gov/states/sc/dss/ccap/income/countable_income/sources.yaml b/policyengine_us/parameters/gov/states/sc/dss/ccap/income/countable_income/sources.yaml
index ebca2e7895e..e58e65460ea 100644
--- a/policyengine_us/parameters/gov/states/sc/dss/ccap/income/countable_income/sources.yaml
+++ b/policyengine_us/parameters/gov/states/sc/dss/ccap/income/countable_income/sources.yaml
@@ -3,6 +3,7 @@ values:
   2022-10-01:
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - farm_income
     - social_security
     - pension_income
diff --git a/policyengine_us/parameters/gov/states/sc/tanf/income/earned/earned.yaml b/policyengine_us/parameters/gov/states/sc/tanf/income/earned/earned.yaml
index a4b18e1b009..02b09ea4d32 100644
--- a/policyengine_us/parameters/gov/states/sc/tanf/income/earned/earned.yaml
+++ b/policyengine_us/parameters/gov/states/sc/tanf/income/earned/earned.yaml
@@ -3,6 +3,7 @@ values:
   1996-07-01:
     - employment_income_before_lsr
     - self_employment_income_before_lsr
+    - sstb_self_employment_income_before_lsr
 metadata:
   unit: list
   period: month 
diff --git a/policyengine_us/parameters/gov/states/tx/tanf/income/sources/earned.yaml b/policyengine_us/parameters/gov/states/tx/tanf/income/sources/earned.yaml
index b7bcf33291b..b073ab32407 100644
--- a/policyengine_us/parameters/gov/states/tx/tanf/income/sources/earned.yaml
+++ b/policyengine_us/parameters/gov/states/tx/tanf/income/sources/earned.yaml
@@ -3,6 +3,7 @@ values:
   2010-01-01:
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
 
 metadata:
   unit: list
diff --git a/policyengine_us/parameters/gov/states/tx/twc/ccs/income/sources.yaml b/policyengine_us/parameters/gov/states/tx/twc/ccs/income/sources.yaml
index 48c5d0693a8..de997edc07a 100644
--- a/policyengine_us/parameters/gov/states/tx/twc/ccs/income/sources.yaml
+++ b/policyengine_us/parameters/gov/states/tx/twc/ccs/income/sources.yaml
@@ -3,6 +3,7 @@ values:
   2020-01-01:
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - dividend_income
     - interest_income 
     - rental_income
diff --git a/policyengine_us/parameters/gov/states/va/dss/ccsp/income/countable_income/earned_sources.yaml b/policyengine_us/parameters/gov/states/va/dss/ccsp/income/countable_income/earned_sources.yaml
index 800fe9d5df8..7864740da4a 100644
--- a/policyengine_us/parameters/gov/states/va/dss/ccsp/income/countable_income/earned_sources.yaml
+++ b/policyengine_us/parameters/gov/states/va/dss/ccsp/income/countable_income/earned_sources.yaml
@@ -3,6 +3,7 @@ values:
   2023-01-01:
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
 
 metadata:
   unit: list
diff --git a/policyengine_us/parameters/gov/states/vt/dcf/ccfap/income/sources.yaml b/policyengine_us/parameters/gov/states/vt/dcf/ccfap/income/sources.yaml
index e3afc512e91..51e291bb95d 100644
--- a/policyengine_us/parameters/gov/states/vt/dcf/ccfap/income/sources.yaml
+++ b/policyengine_us/parameters/gov/states/vt/dcf/ccfap/income/sources.yaml
@@ -3,6 +3,7 @@ values:
   2009-02-09:
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - pension_income
     - social_security
     - alimony_income
diff --git a/policyengine_us/parameters/gov/states/wi/tax/income/credits/homestead/eligible/earnings_sources.yaml b/policyengine_us/parameters/gov/states/wi/tax/income/credits/homestead/eligible/earnings_sources.yaml
index bbf02b2ea54..6881093306b 100644
--- a/policyengine_us/parameters/gov/states/wi/tax/income/credits/homestead/eligible/earnings_sources.yaml
+++ b/policyengine_us/parameters/gov/states/wi/tax/income/credits/homestead/eligible/earnings_sources.yaml
@@ -11,5 +11,6 @@ values:
   2021-01-01:
     - irs_employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - partnership_s_corp_income
     - farm_income
diff --git a/policyengine_us/parameters/gov/states/wi/tax/income/credits/married_couple/income_sources.yaml b/policyengine_us/parameters/gov/states/wi/tax/income/credits/married_couple/income_sources.yaml
index cd2cb4b0873..8f445fda096 100644
--- a/policyengine_us/parameters/gov/states/wi/tax/income/credits/married_couple/income_sources.yaml
+++ b/policyengine_us/parameters/gov/states/wi/tax/income/credits/married_couple/income_sources.yaml
@@ -19,5 +19,6 @@ values:
   2021-01-01:
     - irs_employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - partnership_s_corp_income
     - farm_income
diff --git a/policyengine_us/parameters/gov/territories/pr/tax/income/gross_income/sources.yaml b/policyengine_us/parameters/gov/territories/pr/tax/income/gross_income/sources.yaml
index 7253a516ee1..20cc284a16b 100644
--- a/policyengine_us/parameters/gov/territories/pr/tax/income/gross_income/sources.yaml
+++ b/policyengine_us/parameters/gov/territories/pr/tax/income/gross_income/sources.yaml
@@ -4,6 +4,7 @@ values:
     # salary/wages
     - irs_employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - partnership_s_corp_income
 
     - taxable_retirement_distributions # distributions from retirement plans
diff --git a/policyengine_us/parameters/gov/usda/school_meals/income/sources.yaml b/policyengine_us/parameters/gov/usda/school_meals/income/sources.yaml
index 6fc94bc96a7..d7261f0ea7d 100644
--- a/policyengine_us/parameters/gov/usda/school_meals/income/sources.yaml
+++ b/policyengine_us/parameters/gov/usda/school_meals/income/sources.yaml
@@ -4,6 +4,7 @@ values:
   2009-01-01:
     - employment_income
     - self_employment_income
+    - sstb_self_employment_income
     - dividend_income
     - interest_income
     - gi_cash_assistance
diff --git a/policyengine_us/tests/policy/baseline/gov/hhs/tanf/cash/tanf_gross_earned_income.yaml b/policyengine_us/tests/policy/baseline/gov/hhs/tanf/cash/tanf_gross_earned_income.yaml
new file mode 100644
index 00000000000..242512712c9
--- /dev/null
+++ b/policyengine_us/tests/policy/baseline/gov/hhs/tanf/cash/tanf_gross_earned_income.yaml
@@ -0,0 +1,6 @@
+- name: Includes monthly SSTB self-employment income before LSR
+  period: 2024-01
+  input:
+    sstb_self_employment_income_before_lsr: 12_000
+  output:
+    tanf_gross_earned_income: 1_000
diff --git a/policyengine_us/tests/policy/baseline/gov/irs/income/taxable_income/deductions/qbid/qbid_amount.yaml b/policyengine_us/tests/policy/baseline/gov/irs/income/taxable_income/deductions/qbid/qbid_amount.yaml
index 3d83878de7e..701b1573e1e 100644
--- a/policyengine_us/tests/policy/baseline/gov/irs/income/taxable_income/deductions/qbid/qbid_amount.yaml
+++ b/policyengine_us/tests/policy/baseline/gov/irs/income/taxable_income/deductions/qbid/qbid_amount.yaml
@@ -298,3 +298,23 @@
     # wage_cap (reduced) = 0.50 * 25_000 = 12_500.
     # min(10_000, 12_500) = 10_000.
     qbid_amount: 10_000
+
+- name: Mixed negative non-SSTB and positive SSTB QBI uses explicit SSTB wages
+  period: 2024
+  input:
+    self_employment_income: -1
+    qualified_business_income: 0
+    sstb_qualified_business_income: 100_000
+    w2_wages_from_qualified_business: 100_000
+    sstb_w2_wages_from_qualified_business: 0
+    unadjusted_basis_qualified_property: 0
+    sstb_unadjusted_basis_qualified_property: 0
+    taxable_income_less_qbid: 216_950
+    qualified_reit_and_ptp_income: 0
+    business_is_sstb: false
+    filing_status: SINGLE
+  output:
+    # Non-SSTB gross income is negative, so the wage pool is mixed even though
+    # non-SSTB QBI is zero. With no SSTB allocable wages, the SSTB component
+    # is limited by the zero wage/property cap during phase-in.
+    qbid_amount: 5_000
diff --git a/policyengine_us/tests/policy/baseline/gov/ssa/social_security/ss_aime.yaml b/policyengine_us/tests/policy/baseline/gov/ssa/social_security/ss_aime.yaml
index d6f62bfbbac..e147bcff9ee 100644
--- a/policyengine_us/tests/policy/baseline/gov/ssa/social_security/ss_aime.yaml
+++ b/policyengine_us/tests/policy/baseline/gov/ssa/social_security/ss_aime.yaml
@@ -29,6 +29,15 @@
   output:
     ss_aime: 119.048  # $50,000 / 420 = 119.047...
 
+- name: Worker with current year SSTB self-employment earnings only
+  period: 2024
+  input:
+    age: 62
+    sstb_self_employment_income:
+      2024-01-01: 42_000
+  output:
+    ss_aime: 100
+
 # Note: Full AIME calculation requires:
 # 1. Up to 35 years of earnings history
 # 2. Wage indexing to age 60
@@ -36,4 +45,3 @@
 # 4. Division by 420 months
 # These tests will be expanded once period-spanning is implemented
 
-
diff --git a/policyengine_us/tests/policy/baseline/gov/ssa/social_security/ss_covered_earnings_this_year.yaml b/policyengine_us/tests/policy/baseline/gov/ssa/social_security/ss_covered_earnings_this_year.yaml
index 5c156ebc9a5..9ee1bf28b8b 100644
--- a/policyengine_us/tests/policy/baseline/gov/ssa/social_security/ss_covered_earnings_this_year.yaml
+++ b/policyengine_us/tests/policy/baseline/gov/ssa/social_security/ss_covered_earnings_this_year.yaml
@@ -22,6 +22,14 @@
   output:
     ss_covered_earnings_this_year: 30_000
 
+- name: SSTB self-employment income only
+  period: 2024
+  input:
+    employment_income: 0
+    sstb_self_employment_income: 30_000
+  output:
+    ss_covered_earnings_this_year: 30_000
+
 - name: Combined employment and self-employment income
   period: 2024
   input:
@@ -53,4 +61,3 @@
     self_employment_income: 0
   output:
     ss_covered_earnings_this_year: 160_200  # 2023 wage base
-
diff --git a/policyengine_us/tests/policy/baseline/gov/ssa/social_security/ss_earnings_test_reduction.yaml b/policyengine_us/tests/policy/baseline/gov/ssa/social_security/ss_earnings_test_reduction.yaml
index c90a23fb998..fcba46935f8 100644
--- a/policyengine_us/tests/policy/baseline/gov/ssa/social_security/ss_earnings_test_reduction.yaml
+++ b/policyengine_us/tests/policy/baseline/gov/ssa/social_security/ss_earnings_test_reduction.yaml
@@ -20,6 +20,18 @@
     # Reduction: $27,680 * 0.5 = $13,840
     ss_earnings_test_reduction: 13_840
 
+- name: Reduction includes SSTB self-employment earnings under FRA
+  period: 2024
+  input:
+    age: 64
+    employment_income: 0
+    sstb_self_employment_income: 50_000
+    ss_retirement_benefit_before_earnings_test: 24_000
+  output:
+    # Excess: $50,000 - $22,320 = $27,680
+    # Reduction: $27,680 * 0.5 = $13,840
+    ss_earnings_test_reduction: 13_840
+
 - name: Reduction capped at benefit amount
   period: 2024
   input:
@@ -57,4 +69,3 @@
     ss_full_retirement_age_months: 804  # 67 years
   output:
     ss_earnings_test_reduction: 0
-
diff --git a/policyengine_us/tests/policy/baseline/gov/ssa/social_security/ss_quarters_of_coverage.yaml b/policyengine_us/tests/policy/baseline/gov/ssa/social_security/ss_quarters_of_coverage.yaml
index 2095d171e2a..88577ef8f8d 100644
--- a/policyengine_us/tests/policy/baseline/gov/ssa/social_security/ss_quarters_of_coverage.yaml
+++ b/policyengine_us/tests/policy/baseline/gov/ssa/social_security/ss_quarters_of_coverage.yaml
@@ -62,6 +62,14 @@
   output:
     ss_quarters_of_coverage: 4
 
+- name: SSTB self-employment income counts for quarters
+  period: 2024
+  input:
+    employment_income: 0
+    sstb_self_employment_income: 6_920
+  output:
+    ss_quarters_of_coverage: 4
+
 - name: Combined employment and self-employment
   period: 2024
   input:
@@ -78,4 +86,3 @@
   output:
     ss_quarters_of_coverage: 4
 
-
diff --git a/policyengine_us/tests/policy/baseline/gov/ssa/ssi/income/ssi_earned_income.yaml b/policyengine_us/tests/policy/baseline/gov/ssa/ssi/income/ssi_earned_income.yaml
index 203f3fc6c6d..cc9acb9d8db 100644
--- a/policyengine_us/tests/policy/baseline/gov/ssa/ssi/income/ssi_earned_income.yaml
+++ b/policyengine_us/tests/policy/baseline/gov/ssa/ssi/income/ssi_earned_income.yaml
@@ -11,3 +11,10 @@
     dividend_income: 5
   output:
     ssi_earned_income: 2
+
+- name: Includes SSTB self-employment income.
+  period: 2024
+  input:
+    sstb_self_employment_income: 100_000
+  output:
+    ssi_earned_income: 100_000
diff --git a/policyengine_us/tests/policy/baseline/gov/states/al/tax/income/al_agi.yaml b/policyengine_us/tests/policy/baseline/gov/states/al/tax/income/al_agi.yaml
new file mode 100644
index 00000000000..89d3de31157
--- /dev/null
+++ b/policyengine_us/tests/policy/baseline/gov/states/al/tax/income/al_agi.yaml
@@ -0,0 +1,7 @@
+- name: SSTB self-employment income is included in Alabama AGI
+  period: 2024
+  input:
+    sstb_self_employment_income: 100_000
+    state_code: AL
+  output:
+    al_agi: 100_000
diff --git a/policyengine_us/tests/policy/baseline/gov/states/ar/tax/income/ar_gross_income_indiv.yaml b/policyengine_us/tests/policy/baseline/gov/states/ar/tax/income/ar_gross_income_indiv.yaml
index a9a908a765b..818408ea4bd 100644
--- a/policyengine_us/tests/policy/baseline/gov/states/ar/tax/income/ar_gross_income_indiv.yaml
+++ b/policyengine_us/tests/policy/baseline/gov/states/ar/tax/income/ar_gross_income_indiv.yaml
@@ -14,3 +14,12 @@
         state_code: AR
   output:
     ar_gross_income_indiv: 50_000
+
+- name: Arkansas gross income includes SSTB self-employment income
+  period: 2024
+  input:
+    sstb_self_employment_income: 100_000
+    state_code: AR
+  output:
+    ar_gross_income_indiv: 100_000
+    ar_gross_income_joint: 100_000
diff --git a/policyengine_us/tests/policy/baseline/gov/states/ia/tax/income/ia_gross_income.yaml b/policyengine_us/tests/policy/baseline/gov/states/ia/tax/income/ia_gross_income.yaml
new file mode 100644
index 00000000000..7337123adcd
--- /dev/null
+++ b/policyengine_us/tests/policy/baseline/gov/states/ia/tax/income/ia_gross_income.yaml
@@ -0,0 +1,7 @@
+- name: SSTB self-employment income is included in Iowa gross income
+  period: 2024
+  input:
+    sstb_self_employment_income: 100_000
+    state_code: IA
+  output:
+    ia_gross_income: 100_000
diff --git a/policyengine_us/tests/policy/baseline/gov/states/ms/tax/income/ms_agi.yaml b/policyengine_us/tests/policy/baseline/gov/states/ms/tax/income/ms_agi.yaml
index aa42d0e1685..688e81a7fca 100644
--- a/policyengine_us/tests/policy/baseline/gov/states/ms/tax/income/ms_agi.yaml
+++ b/policyengine_us/tests/policy/baseline/gov/states/ms/tax/income/ms_agi.yaml
@@ -32,3 +32,12 @@
     employment_income: 500
   output:
     ms_agi: 0
+
+- name: SSTB self-employment income is included in Mississippi AGI
+  period: 2024
+  input:
+    sstb_self_employment_income: 100_000
+    ms_agi_adjustments: 0
+    state_code: MS
+  output:
+    ms_agi: 100_000
diff --git a/policyengine_us/tests/policy/baseline/gov/states/nm/tax/income/nm_modified_gross_income.yaml b/policyengine_us/tests/policy/baseline/gov/states/nm/tax/income/nm_modified_gross_income.yaml
index 2b15efd059a..1ea17296921 100644
--- a/policyengine_us/tests/policy/baseline/gov/states/nm/tax/income/nm_modified_gross_income.yaml
+++ b/policyengine_us/tests/policy/baseline/gov/states/nm/tax/income/nm_modified_gross_income.yaml
@@ -10,6 +10,14 @@
   output:
     nm_modified_gross_income: 80_000
 
+- name: NM modified gross income includes SSTB self-employment income
+  period: 2024
+  input:
+    state_code: NM
+    sstb_self_employment_income: 100_000
+  output:
+    nm_modified_gross_income: 100_000
+
 - name: NM business loss should not reduce modified gross income
   period: 2024
   input:
diff --git a/policyengine_us/tests/policy/baseline/gov/states/ok/tax/income/ok_gross_income.yaml b/policyengine_us/tests/policy/baseline/gov/states/ok/tax/income/ok_gross_income.yaml
index 0e4c45d3e6f..e3af5d6da49 100644
--- a/policyengine_us/tests/policy/baseline/gov/states/ok/tax/income/ok_gross_income.yaml
+++ b/policyengine_us/tests/policy/baseline/gov/states/ok/tax/income/ok_gross_income.yaml
@@ -7,3 +7,11 @@
     state_code: OK
   output:
     ok_gross_income: 12_000 + 2_000 + 800
+
+- name: OK gross income includes SSTB self-employment income
+  period: 2024
+  input:
+    sstb_self_employment_income: 100_000
+    state_code: OK
+  output:
+    ok_gross_income: 100_000
diff --git a/policyengine_us/tests/policy/baseline/gov/usda/school_meals/school_meal_countable_income.yaml b/policyengine_us/tests/policy/baseline/gov/usda/school_meals/school_meal_countable_income.yaml
index 401416c8863..6f04f88f648 100644
--- a/policyengine_us/tests/policy/baseline/gov/usda/school_meals/school_meal_countable_income.yaml
+++ b/policyengine_us/tests/policy/baseline/gov/usda/school_meals/school_meal_countable_income.yaml
@@ -24,3 +24,10 @@
         members: [p1, p2]
   output:
     school_meal_countable_income: 30_500
+
+- name: Includes SSTB self-employment income.
+  period: 2024
+  input:
+    sstb_self_employment_income: 100_000
+  output:
+    school_meal_countable_income: 100_000
diff --git a/policyengine_us/variables/gov/irs/income/taxable_income/deductions/qualified_business_income_deduction/qbid_amount.py b/policyengine_us/variables/gov/irs/income/taxable_income/deductions/qualified_business_income_deduction/qbid_amount.py
index 262782294b2..d9143523bd8 100644
--- a/policyengine_us/variables/gov/irs/income/taxable_income/deductions/qualified_business_income_deduction/qbid_amount.py
+++ b/policyengine_us/variables/gov/irs/income/taxable_income/deductions/qualified_business_income_deduction/qbid_amount.py
@@ -55,8 +55,19 @@ def qbi_component(qbi, full_cap, sstb_multiplier):
         sstb_qbi = sstb_qbi_from_se + where(is_sstb_legacy, non_sstb_qbi, 0)
         non_sstb_qbi_final = where(is_sstb_legacy, 0, non_sstb_qbi)
 
-        has_non_sstb = non_sstb_qbi_final > 0
-        has_sstb = sstb_qbi > 0
+        non_sstb_gross = 0
+        for var in p.income_definition:
+            non_sstb_gross += person(var, period) * person(
+                var + "_would_be_qualified", period
+            )
+        sstb_gross = person("sstb_self_employment_income", period) * person(
+            "sstb_self_employment_income_would_be_qualified", period
+        )
+        non_sstb_gross_final = where(is_sstb_legacy, 0, non_sstb_gross)
+        sstb_gross_final = sstb_gross + where(is_sstb_legacy, non_sstb_gross, 0)
+
+        has_non_sstb = (non_sstb_gross_final != 0) | (non_sstb_qbi_final > 0)
+        has_sstb = (sstb_gross_final != 0) | (sstb_qbi > 0)
         has_mixed_categories = has_non_sstb & has_sstb
 
         # Schedule A applies the SSTB applicable percentage to the SSTB's own
diff --git a/policyengine_us/variables/gov/ssa/social_security/ss_aime.py b/policyengine_us/variables/gov/ssa/social_security/ss_aime.py
index 4f3b17d68f7..02d843eebf5 100644
--- a/policyengine_us/variables/gov/ssa/social_security/ss_aime.py
+++ b/policyengine_us/variables/gov/ssa/social_security/ss_aime.py
@@ -53,7 +53,7 @@ def _compute_aime(person, period, parameters):
             year_period = period.this_year.offset(-int(years_ago))
 
             employment_income = person("employment_income", year_period)
-            self_employment_income = person("self_employment_income", year_period)
+            self_employment_income = person("total_self_employment_income", year_period)
             total_earnings = employment_income + self_employment_income
 
             wage_base = parameters(year_period).gov.ssa.social_security.wage_base
diff --git a/policyengine_us/variables/gov/ssa/social_security/ss_covered_earnings_this_year.py b/policyengine_us/variables/gov/ssa/social_security/ss_covered_earnings_this_year.py
index 110dcd5c5ab..a35ea38072f 100644
--- a/policyengine_us/variables/gov/ssa/social_security/ss_covered_earnings_this_year.py
+++ b/policyengine_us/variables/gov/ssa/social_security/ss_covered_earnings_this_year.py
@@ -11,7 +11,7 @@ class ss_covered_earnings_this_year(Variable):
 
     def formula(person, period, parameters):
         employment_income = person("employment_income", period)
-        self_employment_income = person("self_employment_income", period)
+        self_employment_income = person("total_self_employment_income", period)
 
         total_earnings = employment_income + self_employment_income
 
diff --git a/policyengine_us/variables/gov/ssa/social_security/ss_earnings_test_reduction.py b/policyengine_us/variables/gov/ssa/social_security/ss_earnings_test_reduction.py
index 09588bb788f..11cd8906f30 100644
--- a/policyengine_us/variables/gov/ssa/social_security/ss_earnings_test_reduction.py
+++ b/policyengine_us/variables/gov/ssa/social_security/ss_earnings_test_reduction.py
@@ -22,7 +22,7 @@ def formula(person, period, parameters):
 
         # Get earnings
         employment_income = person("employment_income", period)
-        self_employment_income = person("self_employment_income", period)
+        self_employment_income = person("total_self_employment_income", period)
         total_earnings = employment_income + self_employment_income
 
         p = parameters(period).gov.ssa.social_security.earnings_test
diff --git a/policyengine_us/variables/gov/ssa/social_security/ss_quarters_of_coverage.py b/policyengine_us/variables/gov/ssa/social_security/ss_quarters_of_coverage.py
index ab30f773f1f..d3d957e1970 100644
--- a/policyengine_us/variables/gov/ssa/social_security/ss_quarters_of_coverage.py
+++ b/policyengine_us/variables/gov/ssa/social_security/ss_quarters_of_coverage.py
@@ -14,7 +14,7 @@ class ss_quarters_of_coverage(Variable):
 
     def formula(person, period, parameters):
         employment_income = person("employment_income", period)
-        self_employment_income = person("self_employment_income", period)
+        self_employment_income = person("total_self_employment_income", period)
 
         total_earnings = employment_income + self_employment_income