diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4dd2ad166..6d59e8881 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Keep science-practice single-column for tables with 6+ columns
 - Indent question stem lists less in `carnival`
 - Indent first-level lists in eos sections in `corn`
+- Set table width to 95% in `ModuleContainerWithTwoColumns` exercises in `ap-physics-2e`
+- Use single-column for `ap-test-prep` with tables having six or more columns
 - Align `os-number` right in AP Physics 2e `TestPrep`
 
 ## [v2.19.0] - 2026-04-15
diff --git a/styles/books/ap-physics-2e/book.scss b/styles/books/ap-physics-2e/book.scss
index 77c1cefb0..af941aeab 100644
--- a/styles/books/ap-physics-2e/book.scss
+++ b/styles/books/ap-physics-2e/book.scss
@@ -11,7 +11,9 @@
 
 @include add_settings((
   TwoColumnsModules: (
-    _selectors: ('.os-ap-test-prep-container'),
+    _selectors: ('.os-ap-test-prep-container:not(:has(.os-table > table tr td:nth-of-type(6)))'),
+    'ModuleContainerWithTwoColumnsTable:::width': 95%,
+    'ModuleContainerWithTwoColumnsTable:::margin': auto,
   ),
 ));
 
diff --git a/styles/designs/carnival/parts/_module-components.scss b/styles/designs/carnival/parts/_module-components.scss
index 0b38b7a4c..fefb663d9 100644
--- a/styles/designs/carnival/parts/_module-components.scss
+++ b/styles/designs/carnival/parts/_module-components.scss
@@ -10,6 +10,15 @@ $Module__Container--WithTwoColumns: (
     ),
 );
 
+$Module__Container--WithTwoColumns__Table: (
+    _name: "ModuleContainerWithTwoColumnsTable",
+    _subselector: " .os-table > table",
+    _properties: (
+        width: enum('ValueSet:::OPTIONAL'),
+        margin: enum('ValueSet:::OPTIONAL'),
+    )
+);
+
 $ModuleWithIndentation__Para: (
     _name: "ModuleWithIndentationPara",
     _subselector: ' > p',
diff --git a/styles/designs/carnival/parts/_module-shapes.scss b/styles/designs/carnival/parts/_module-shapes.scss
index 059043535..a541922a4 100644
--- a/styles/designs/carnival/parts/_module-shapes.scss
+++ b/styles/designs/carnival/parts/_module-shapes.scss
@@ -4,7 +4,11 @@
 
 @include create_shape('carnival:::ModuleWithTwoColumnsShape', (
     _components: (
-      $Module__Container--WithTwoColumns
+        map-merge($Module__Container--WithTwoColumns, (
+            _components: (
+                $Module__Container--WithTwoColumns__Table
+            )
+        ))
     )
 ));
 
diff --git a/styles/output/ap-physics-2e-pdf.css b/styles/output/ap-physics-2e-pdf.css
index 64c2f71d1..74023fce3 100644
--- a/styles/output/ap-physics-2e-pdf.css
+++ b/styles/output/ap-physics-2e-pdf.css
@@ -3580,12 +3580,17 @@ h4.os-subtitle + .os-figure:not(.has-splash) > figure {
   width: 100%;
 }
 
-.os-ap-test-prep-container {
+.os-ap-test-prep-container:not(:has(.os-table > table tr td:nth-of-type(6))) {
   column-count: 2;
   column-gap: 2.4rem;
   column-width: auto;
 }
 
+.os-ap-test-prep-container:not(:has(.os-table > table tr td:nth-of-type(6))) .os-table > table {
+  width: 95%;
+  margin: auto;
+}
+
 .os-ap-test-prep-container section {
   margin-bottom: 0;
 }