diff --git a/common/azure-test-watcher/README.md b/common/azure-test-watcher/README.md
deleted file mode 100644
index 9c783341d4afc..0000000000000
--- a/common/azure-test-watcher/README.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# Azure Test Watcher client library for Java
-
-Azure Test Watcher client library adds an implementations of JUnit 5's before and after test extensions and creates an SPI that will be loaded during the test run
-
-## Getting started
-
-### Prerequisites
-
-- Java Development Kit (JDK) with version 8 or above
-
-### Adding the package to your product
-
-[//]: # ({x-version-update-start;com.azure:azure-test-watcher;current})
-```xml
-<dependency>
-    <groupId>com.azure</groupId>
-    <artifactId>azure-test-watcher</artifactId>
-    <version>1.0.0-beta.1</version>
-</dependency>
-```
-[//]: # ({x-version-update-end})
-
-## Key concepts
-
-
-## Examples
-
-## Troubleshooting
-
-## Next steps
-
-## Contributing
-
-If you would like to become an active contributor to this project please follow the instructions provided in [Microsoft
-Azure Projects Contribution Guidelines](http://azure.github.io/guidelines.html).
-
-1. Fork it
-1. Create your feature branch (`git checkout -b my-new-feature`)
-1. Commit your changes (`git commit -am 'Add some feature'`)
-1. Push to the branch (`git push origin my-new-feature`)
-1. Create new Pull Request
-
-![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-java%2Fcommon%2Fazure-test-watcher%2FREADME.png)
diff --git a/common/azure-test-watcher/pom.xml b/common/azure-test-watcher/pom.xml
deleted file mode 100644
index 3210abbfa5a4d..0000000000000
--- a/common/azure-test-watcher/pom.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <groupId>com.azure</groupId>
-  <artifactId>azure-test-watcher</artifactId>
-  <version>1.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-test-watcher;current} -->
-
-  <parent>
-    <groupId>com.azure</groupId>
-    <artifactId>azure-client-sdk-parent</artifactId>
-    <version>1.7.0</version> <!-- {x-version-update;com.azure:azure-client-sdk-parent;current} -->
-    <relativePath>../../sdk/parents/azure-client-sdk-parent</relativePath>
-  </parent>
-
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-
-    <site.url>https://azuresdkartifacts.blob.core.windows.net/azure-sdk-for-java</site.url>
-
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
-  </properties>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0-M3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-enforcer-plugin;external_dependency} -->
-        <configuration>
-          <rules>
-            <bannedDependencies>
-              <includes>
-                <include>com.azure:*</include>
-
-                <!-- special allowance for azure-test-watcher as it is not a shipping library: -->
-                <include>org.junit.jupiter:junit-jupiter:[5.6.2]</include> <!-- {x-include-update;org.junit.jupiter:junit-jupiter;external_dependency} -->
-                <include>org.junit.jupiter:junit-jupiter-api:[5.6.2]</include> <!-- {x-include-update;org.junit.jupiter:junit-jupiter-api;external_dependency} -->
-              </includes>
-            </bannedDependencies>
-          </rules>
-        </configuration>
-      </plugin>
-
-      <!-- Run the JAR goal for azure-test-watcher during the test phase to guarantee its existence when tests are running -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>3.1.2</version> <!-- {x-version-update;org.apache.maven.plugins:maven-jar-plugin;external_dependency} -->
-        <configuration>
-          <outputDirectory>${packageOutputDirectory}</outputDirectory>
-        </configuration>
-        <executions>
-          <execution>
-            <id>default-jar</id>
-            <phase>test</phase>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter</artifactId>
-      <version>5.6.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter;external_dependency} -->
-    </dependency>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-api</artifactId>
-      <version>5.6.2</version> <!-- {x-version-update;org.junit.jupiter:junit-jupiter-api;external_dependency} -->
-    </dependency>
-  </dependencies>
-</project>
diff --git a/common/azure-test-watcher/src/main/java/com/azure/testing/package-info.java b/common/azure-test-watcher/src/main/java/com/azure/testing/package-info.java
deleted file mode 100644
index 295ed604e6709..0000000000000
--- a/common/azure-test-watcher/src/main/java/com/azure/testing/package-info.java
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-/**
- * Package containing JUnit 5 testing extensions.
- */
-package com.azure.testing;
diff --git a/common/azure-test-watcher/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/common/azure-test-watcher/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
deleted file mode 100644
index 3fa30aa817c75..0000000000000
--- a/common/azure-test-watcher/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
+++ /dev/null
@@ -1 +0,0 @@
-com.azure.testing.AzureTestWatcher
diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt
index 277a78335fb18..ca739e6b6f004 100644
--- a/eng/versioning/version_client.txt
+++ b/eng/versioning/version_client.txt
@@ -49,7 +49,6 @@ com.azure:azure-storage-internal-avro;12.0.0-beta.1;12.0.0-beta.2
 com.azure:azure-storage-perf;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-storage-queue;12.6.0-beta.1;12.6.0-beta.2
 com.azure:perf-test-core;1.0.0-beta.1;1.0.0-beta.1
-com.azure:azure-test-watcher;1.0.0-beta.1;1.0.0-beta.1
 com.azure:azure-spring-boot-test-aad;1.0.0;1.0.0
 com.azure:azure-spring-boot-test-core;1.0.0;1.0.0
 com.azure:azure-spring-boot-test-cosmosdb;1.0.0;1.0.0
diff --git a/pom.xml b/pom.xml
index 807e0f82055ce..677664e21ce65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,6 @@
   <packaging>pom</packaging>
   <version>1.0.0</version><!-- Need not change for every release-->
   <modules>
-    <module>common/azure-test-watcher</module>
     <module>common/perf-test-core</module>
     <module>eng/jacoco-test-coverage</module>
     <module>eng/code-quality-reports</module>
diff --git a/common/azure-test-watcher/src/main/java/com/azure/testing/AzureTestWatcher.java b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/AzureTestWatcher.java
similarity index 98%
rename from common/azure-test-watcher/src/main/java/com/azure/testing/AzureTestWatcher.java
rename to sdk/core/azure-core-test/src/main/java/com/azure/core/test/AzureTestWatcher.java
index ee79b70406651..551c6abc5b436 100644
--- a/common/azure-test-watcher/src/main/java/com/azure/testing/AzureTestWatcher.java
+++ b/sdk/core/azure-core-test/src/main/java/com/azure/core/test/AzureTestWatcher.java
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-package com.azure.testing;
+package com.azure.core.test;
 
 import org.junit.jupiter.api.extension.AfterTestExecutionCallback;
 import org.junit.jupiter.api.extension.BeforeTestExecutionCallback;
diff --git a/sdk/core/azure-core-test/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/sdk/core/azure-core-test/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
new file mode 100644
index 0000000000000..19d1b79f06c19
--- /dev/null
+++ b/sdk/core/azure-core-test/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension
@@ -0,0 +1 @@
+com.azure.core.test.AzureTestWatcher
diff --git a/sdk/parents/azure-client-sdk-parent/pom.xml b/sdk/parents/azure-client-sdk-parent/pom.xml
index 8276bdfb8eb76..ad31d3479c60d 100644
--- a/sdk/parents/azure-client-sdk-parent/pom.xml
+++ b/sdk/parents/azure-client-sdk-parent/pom.xml
@@ -731,17 +731,7 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
           <version>3.0.0-M3</version> <!-- {x-version-update;org.apache.maven.plugins:maven-surefire-plugin;external_dependency} -->
-          <dependencies>
-            <dependency>
-              <groupId>com.azure</groupId>
-              <artifactId>azure-test-watcher</artifactId>
-              <version>1.0.0-beta.1</version> <!-- {x-version-update;com.azure:azure-test-watcher;dependency} -->
-            </dependency>
-          </dependencies>
           <configuration>
-            <additionalClasspathElements>
-              <additionalClasspathElement>../../../common/azure-test-watcher/target/azure-test-watcher-1.0.0-beta.1.jar</additionalClasspathElement>
-            </additionalClasspathElements>
             <runOrder>alphabetical</runOrder>
             <useSystemClassLoader>false</useSystemClassLoader>
             <systemPropertyVariables combine.children="append">