diff --git a/src/dev-app/table-scroll-container/BUILD.bazel b/src/dev-app/table-scroll-container/BUILD.bazel
index 2349a33881a8..51e32a8b4d7b 100644
--- a/src/dev-app/table-scroll-container/BUILD.bazel
+++ b/src/dev-app/table-scroll-container/BUILD.bazel
@@ -13,7 +13,6 @@ ng_module(
         "//src/cdk-experimental/table-scroll-container",
         "//src/material/button",
         "//src/material/button-toggle",
-        "//src/material/legacy-table",
         "//src/material/table",
         "@npm//@angular/common",
         "@npm//@angular/core",
diff --git a/src/dev-app/table-scroll-container/table-scroll-container-demo.scss b/src/dev-app/table-scroll-container/table-scroll-container-demo.scss
index 5d6a5e701483..2479bbf75c82 100644
--- a/src/dev-app/table-scroll-container/table-scroll-container-demo.scss
+++ b/src/dev-app/table-scroll-container/table-scroll-container-demo.scss
@@ -3,7 +3,7 @@
   overflow: auto;
 }
 
-.mat-table-sticky {
+.mat-mdc-table-sticky, .mat-mdc-table-sticky.mat-mdc-header-cell {
   background: #59abfd;
   opacity: 1;
 }
@@ -18,7 +18,7 @@
   text-align: center;
 }
 
-.mat-header-cell, .mat-footer-cell, .mat-cell {
+.mat-mdc-header-cell, .mat-mdc-footer-cell, .mat-mdc-cell {
   min-width: 80px;
   box-sizing: border-box;
 }
diff --git a/src/dev-app/table-scroll-container/table-scroll-container-demo.ts b/src/dev-app/table-scroll-container/table-scroll-container-demo.ts
index 18ab6f336d1a..b39a95145d0d 100644
--- a/src/dev-app/table-scroll-container/table-scroll-container-demo.ts
+++ b/src/dev-app/table-scroll-container/table-scroll-container-demo.ts
@@ -11,7 +11,7 @@ import {CommonModule} from '@angular/common';
 import {CdkTableScrollContainerModule} from '@angular/cdk-experimental/table-scroll-container';
 import {MatButtonModule} from '@angular/material/button';
 import {MatButtonToggleGroup, MatButtonToggleModule} from '@angular/material/button-toggle';
-import {MatLegacyTableModule} from '@angular/material/legacy-table';
+import {MatTableModule} from '@angular/material/table';
 
 /**
  * @title Tables with toggle-able sticky headers, footers, and columns
@@ -26,7 +26,7 @@ import {MatLegacyTableModule} from '@angular/material/legacy-table';
     CommonModule,
     MatButtonModule,
     MatButtonToggleModule,
-    MatLegacyTableModule,
+    MatTableModule,
   ],
 })
 export class TableScrollContainerDemo {
diff --git a/src/material/legacy-table/testing/BUILD.bazel b/src/material/legacy-table/testing/BUILD.bazel
index 2d78fe518c1f..71ca20b6bf46 100644
--- a/src/material/legacy-table/testing/BUILD.bazel
+++ b/src/material/legacy-table/testing/BUILD.bazel
@@ -19,17 +19,6 @@ filegroup(
     srcs = glob(["**/*.ts"]),
 )
 
-ng_test_library(
-    name = "harness_tests_lib",
-    srcs = ["shared.spec.ts"],
-    deps = [
-        ":testing",
-        "//src/cdk/testing",
-        "//src/cdk/testing/testbed",
-        "//src/material/legacy-table",
-    ],
-)
-
 ng_test_library(
     name = "unit_tests_lib",
     srcs = glob(
@@ -37,9 +26,9 @@ ng_test_library(
         exclude = ["shared.spec.ts"],
     ),
     deps = [
-        ":harness_tests_lib",
         ":testing",
         "//src/material/legacy-table",
+        "//src/material/table/testing:harness_tests_lib",
     ],
 )
 
diff --git a/src/material/legacy-table/testing/table-harness.spec.ts b/src/material/legacy-table/testing/table-harness.spec.ts
index aae5d251d6a0..eae55d894835 100644
--- a/src/material/legacy-table/testing/table-harness.spec.ts
+++ b/src/material/legacy-table/testing/table-harness.spec.ts
@@ -1,7 +1,7 @@
 import {MatLegacyTableModule} from '@angular/material/legacy-table';
-import {runHarnessTests} from '@angular/material/legacy-table/testing/shared.spec';
+import {runHarnessTests} from '@angular/material/table/testing/shared.spec';
 import {MatLegacyTableHarness} from './table-harness';
 
 describe('Non-MDC-based MatTableHarness', () => {
-  runHarnessTests(MatLegacyTableModule, MatLegacyTableHarness);
+  runHarnessTests(MatLegacyTableModule, MatLegacyTableHarness as any);
 });
diff --git a/src/material/table/testing/BUILD.bazel b/src/material/table/testing/BUILD.bazel
index dee76f678f44..53fdbd216d49 100644
--- a/src/material/table/testing/BUILD.bazel
+++ b/src/material/table/testing/BUILD.bazel
@@ -18,12 +18,26 @@ filegroup(
     srcs = glob(["**/*.ts"]),
 )
 
+ng_test_library(
+    name = "harness_tests_lib",
+    srcs = ["shared.spec.ts"],
+    deps = [
+        ":testing",
+        "//src/cdk/testing",
+        "//src/cdk/testing/testbed",
+        "//src/material/table",
+    ],
+)
+
 ng_test_library(
     name = "unit_tests_lib",
-    srcs = glob(["**/*.spec.ts"]),
+    srcs = glob(
+        ["**/*.spec.ts"],
+        exclude = ["shared.spec.ts"],
+    ),
     deps = [
+        ":harness_tests_lib",
         ":testing",
-        "//src/material/legacy-table/testing:harness_tests_lib",
         "//src/material/table",
     ],
 )
diff --git a/src/material/legacy-table/testing/shared.spec.ts b/src/material/table/testing/shared.spec.ts
similarity index 97%
rename from src/material/legacy-table/testing/shared.spec.ts
rename to src/material/table/testing/shared.spec.ts
index 588d4855ffdf..d8ae95d31c37 100644
--- a/src/material/legacy-table/testing/shared.spec.ts
+++ b/src/material/table/testing/shared.spec.ts
@@ -2,13 +2,13 @@ import {HarnessLoader, parallel} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 import {Component} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
-import {MatLegacyTableModule} from '@angular/material/legacy-table';
-import {MatLegacyTableHarness} from './table-harness';
+import {MatTableModule} from '../module';
+import {MatTableHarness} from './table-harness';
 
 /** Shared tests to run on both the original and MDC-based table. */
 export function runHarnessTests(
-  tableModule: typeof MatLegacyTableModule,
-  tableHarness: typeof MatLegacyTableHarness,
+  tableModule: typeof MatTableModule,
+  tableHarness: typeof MatTableHarness,
 ) {
   let fixture: ComponentFixture<TableHarnessTest>;
   let loader: HarnessLoader;
diff --git a/src/material/table/testing/table-harness.spec.ts b/src/material/table/testing/table-harness.spec.ts
index 12ba3e807b36..88cc788323cf 100644
--- a/src/material/table/testing/table-harness.spec.ts
+++ b/src/material/table/testing/table-harness.spec.ts
@@ -1,7 +1,7 @@
 import {MatTableModule} from '@angular/material/table';
-import {runHarnessTests} from '@angular/material/legacy-table/testing/shared.spec';
+import {runHarnessTests} from './shared.spec';
 import {MatTableHarness} from './table-harness';
 
 describe('MDC-based MatTableHarness', () => {
-  runHarnessTests(MatTableModule, MatTableHarness as any);
+  runHarnessTests(MatTableModule, MatTableHarness);
 });