diff --git a/common/smoke-tests/README.md b/common/smoke-tests/README.md
index 2fb1f10013f2..2baf3265bc00 100644
--- a/common/smoke-tests/README.md
+++ b/common/smoke-tests/README.md
@@ -74,7 +74,7 @@ All the classes in this sample not depend on each other.
 
 It is possible to run them individually:
 ```java
-package com.azure;
+package com.azure.smoketest;
 import java.io.IOException;
 
 public class App {
diff --git a/common/smoke-tests/pom.xml b/common/smoke-tests/pom.xml
index e3a4a5e9ce6e..47e1b5007cf1 100644
--- a/common/smoke-tests/pom.xml
+++ b/common/smoke-tests/pom.xml
@@ -29,10 +29,7 @@
     <profile>
       <id>java8</id>
       <activation>
-        <activeByDefault>true</activeByDefault>
-        <property>
-          <name>!java-lts</name>
-        </property>
+        <jdk>[1.8,9)</jdk>
       </activation>
       <build>
         <plugins>
@@ -43,6 +40,9 @@
             <configuration>
               <source>1.8</source>
               <target>1.8</target>
+              <excludes>
+                <exclude>module-info.java</exclude>
+              </excludes>
               <showWarnings>true</showWarnings>
               <showDeprecation>true</showDeprecation>
               <compilerArgument>-Xlint:all</compilerArgument>
@@ -55,9 +55,7 @@
     <profile>
       <id>java-lts</id>
       <activation>
-        <property>
-          <name>java-lts</name>
-        </property>
+        <jdk>[11,)</jdk>
       </activation>
       <build>
         <plugins>
@@ -90,61 +88,67 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core</artifactId>
-      <version>1.2.0</version>
+      <version>1.11.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-http-netty</artifactId>
-      <version>1.5.0</version>
+      <version>1.7.0</version> <!-- {x-version-update;com.azure:azure-core-http-netty;dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-tracing-opentelemetry</artifactId>
-      <version>1.0.0-beta.4</version>
+      <version>1.0.0-beta.6</version> <!-- {x-version-update;com.azure:azure-core-tracing-opentelemetry;dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-http-okhttp</artifactId>
-      <version>1.2.1</version>
+      <version>1.4.0</version> <!-- {x-version-update;com.azure:azure-core-http-okhttp;dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core-amqp</artifactId>
-      <version>1.0.2</version>
+      <version>2.0.0</version> <!-- {x-version-update;com.azure:azure-core-amqp;dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-cosmos</artifactId>
-      <version>4.0.1-beta.1</version>
+      <version>4.8.0</version> <!-- {x-version-update;com.azure:azure-cosmos;dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-identity</artifactId>
-      <version>1.1.0</version>
+      <version>1.2.0</version> <!-- {x-version-update;com.azure:azure-identity;dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-security-keyvault-secrets</artifactId>
-      <version>4.2.0</version>
+      <version>4.3.0-beta.2</version> <!-- {x-version-update;com.azure:azure-security-keyvault-secrets;dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-messaging-eventhubs</artifactId>
-      <version>5.0.1</version>
+      <version>5.3.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs;dependency} -->
+    </dependency>
+
+    <dependency>
+      <groupId>com.azure</groupId>
+      <artifactId>azure-messaging-eventhubs-checkpointstore-blob</artifactId>
+      <version>1.3.1</version> <!-- {x-version-update;com.azure:azure-messaging-eventhubs-checkpointstore-blob;dependency} -->
     </dependency>
 
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-storage-blob</artifactId>
-      <version>12.3.0</version>
+      <version>12.9.0</version> <!-- {x-version-update;com.azure:azure-storage-blob;dependency} -->
     </dependency>
 
     <dependency>
diff --git a/common/smoke-tests/smoke-test.yml b/common/smoke-tests/smoke-test.yml
index 4da131e50836..af61608abcbb 100644
--- a/common/smoke-tests/smoke-test.yml
+++ b/common/smoke-tests/smoke-test.yml
@@ -10,68 +10,57 @@ jobs:
     strategy:
       matrix:
         Java 8 Windows (AzureCloud):
-          ProfileFlag: ''
           JavaTestVersion: '1.8'
           OSVmImage: windows-2019
           SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
           ArmTemplateParameters: $(azureCloudArmParameters)
         Java LTS Windows (AzureCloud):
-          ProfileFlag: '-Pjava-lts'
           JavaTestVersion: '1.11'
           OSVmImage: windows-2019
           SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
           ArmTemplateParameters: $(azureCloudArmParameters)
         Java 8 Linux (AzureCloud):
-          ProfileFlag: ''
           JavaTestVersion: '1.8'
           OSVmImage: ubuntu-18.04
           SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
           ArmTemplateParameters: $(azureCloudArmParameters)
         Java LTS Linux (AzureCloud):
-          ProfileFlag: '-Pjava-lts'
           JavaTestVersion: '1.11'
           OSVmImage: ubuntu-18.04
           SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
           ArmTemplateParameters: $(azureCloudArmParameters)
         Java LTS Linux (AzureCloud Canary):
-          ProfileFlag: '-Pjava-lts'
           JavaTestVersion: '1.11'
           OSVmImage: ubuntu-18.04
           SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources-preview)
           ArmTemplateParameters: $(azureCloudArmParameters)
           Location: 'eastus2euap'
         Java 8 MacOS (AzureCloud):
-          ProfileFlag: ''
           JavaTestVersion: '1.8'
           OSVmImage: macOS-10.15
           SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
           ArmTemplateParameters: $(azureCloudArmParameters)
         Java LTS MacOS (AzureCloud):
-          ProfileFlag: '-Pjava-lts'
           JavaTestVersion: '1.11'
           OSVmImage: macOS-10.15
           SubscriptionConfiguration: $(sub-config-azure-cloud-test-resources)
           ArmTemplateParameters: $(azureCloudArmParameters)
         Java 8 Windows (AzureUSGovernment):
-          ProfileFlag: ''
           JavaTestVersion: '1.8'
           OSVmImage: windows-2019
           SubscriptionConfiguration: $(sub-config-gov-test-resources)
           ArmTemplateParameters: $(azureUSGovernmentArmParameters)
         Java LTS Windows (AzureUSGovernment):
-          ProfileFlag: '-Pjava-lts'
           JavaTestVersion: '1.11'
           OSVmImage: windows-2019
           SubscriptionConfiguration: $(sub-config-gov-test-resources)
           ArmTemplateParameters: $(azureUSGovernmentArmParameters)
         Java 8 Windows (AzureChinaCloud):
-          ProfileFlag: ''
           JavaTestVersion: '1.8'
           OSVmImage: windows-2019
           SubscriptionConfiguration: $(sub-config-cn-test-resources)
           ArmTemplateParameters: $(azureChinaCloudArmParameters)
         Java LTS Windows (AzureChinaCloud):
-          ProfileFlag: '-Pjava-lts'
           JavaTestVersion: '1.11'
           OSVmImage: windows-2019
           SubscriptionConfiguration: $(sub-config-cn-test-resources)
@@ -92,7 +81,7 @@ jobs:
         inputs:
           mavenPomFile: $(PomFile)
           goals: 'versions:use-latest-versions'
-          options: '$(DefaultOptions) $(ProfileFlag) --no-transfer-progress -DskipTests "-Dincludes=com.azure:*"'
+          options: '$(DefaultOptions) --no-transfer-progress -DskipTests "-Dincludes=com.azure:*"'
           javaHomeOption: 'JDKVersion'
           jdkVersionOption: $(JavaTestVersion)
           jdkArchitectureOption: 'x64'
@@ -118,7 +107,7 @@ jobs:
         inputs:
           mavenPomFile: $(PomFile)
           goals: 'dependency:tree'
-          options: '$(DefaultOptions) $(ProfileFlag) --no-transfer-progress -DskipTests'
+          options: '$(DefaultOptions) --no-transfer-progress -DskipTests'
           javaHomeOption: 'JDKVersion'
           jdkVersionOption: $(JavaTestVersion)
           jdkArchitectureOption: 'x64'
@@ -129,7 +118,7 @@ jobs:
         inputs:
           mavenPomFile: $(PomFile)
           goals: 'package'
-          options: '$(DefaultOptions) $(ProfileFlag) --no-transfer-progress -DskipTests'
+          options: '$(DefaultOptions) --no-transfer-progress -DskipTests'
           javaHomeOption: 'JDKVersion'
           jdkVersionOption: $(JavaTestVersion)
           jdkArchitectureOption: 'x64'
@@ -146,7 +135,7 @@ jobs:
         inputs:
           mavenPomFile: $(PomFile)
           goals: 'exec:java'
-          options: '$(DefaultOptions) $(ProfileFlag) -Dexec.mainClass="com.azure.App"'
+          options: '$(DefaultOptions) -Dexec.mainClass="com.azure.smoketest.App"'
           javaHomeOption: 'JDKVersion'
           jdkVersionOption: $(JavaTestVersion)
           jdkArchitectureOption: 'x64'
diff --git a/common/smoke-tests/src/main/java/com/azure/App.java b/common/smoke-tests/src/main/java/com/azure/smoketest/App.java
similarity index 96%
rename from common/smoke-tests/src/main/java/com/azure/App.java
rename to common/smoke-tests/src/main/java/com/azure/smoketest/App.java
index ecb6bf00e321..6a80b1b86999 100644
--- a/common/smoke-tests/src/main/java/com/azure/App.java
+++ b/common/smoke-tests/src/main/java/com/azure/smoketest/App.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure;
+package com.azure.smoketest;
 
 import java.io.IOException;
 import org.slf4j.Logger;
diff --git a/common/smoke-tests/src/main/java/com/azure/CosmosDB.java b/common/smoke-tests/src/main/java/com/azure/smoketest/CosmosDB.java
similarity index 100%
rename from common/smoke-tests/src/main/java/com/azure/CosmosDB.java
rename to common/smoke-tests/src/main/java/com/azure/smoketest/CosmosDB.java
diff --git a/common/smoke-tests/src/main/java/com/azure/EventHubs.java b/common/smoke-tests/src/main/java/com/azure/smoketest/EventHubs.java
similarity index 96%
rename from common/smoke-tests/src/main/java/com/azure/EventHubs.java
rename to common/smoke-tests/src/main/java/com/azure/smoketest/EventHubs.java
index 937a40bf2c23..20ea7313451a 100644
--- a/common/smoke-tests/src/main/java/com/azure/EventHubs.java
+++ b/common/smoke-tests/src/main/java/com/azure/smoketest/EventHubs.java
@@ -1,18 +1,16 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure;
+package com.azure.smoketest;
 
 import com.azure.messaging.eventhubs.EventHubClientBuilder;
 import com.azure.messaging.eventhubs.EventHubConsumerAsyncClient;
 import com.azure.messaging.eventhubs.EventHubProducerAsyncClient;
 import com.azure.messaging.eventhubs.EventData;
 import com.azure.messaging.eventhubs.models.CreateBatchOptions;
-import com.azure.messaging.eventhubs.models.EventPosition;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import reactor.core.Disposable;
-import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.util.Arrays;
@@ -22,9 +20,6 @@
 
 import java.time.Duration;
 
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-
 
 public class EventHubs {
     private static final String EVENT_HUBS_CONNECTION_STRING = System.getenv("AZURE_EVENT_HUBS_CONNECTION_STRING");
diff --git a/common/smoke-tests/src/main/java/com/azure/KeyVaultSecrets.java b/common/smoke-tests/src/main/java/com/azure/smoketest/KeyVaultSecrets.java
similarity index 99%
rename from common/smoke-tests/src/main/java/com/azure/KeyVaultSecrets.java
rename to common/smoke-tests/src/main/java/com/azure/smoketest/KeyVaultSecrets.java
index c30b91ee3866..7c85855401c2 100644
--- a/common/smoke-tests/src/main/java/com/azure/KeyVaultSecrets.java
+++ b/common/smoke-tests/src/main/java/com/azure/smoketest/KeyVaultSecrets.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure;
+package com.azure.smoketest;
 
 import com.azure.identity.AzureAuthorityHosts;
 import com.azure.identity.DefaultAzureCredentialBuilder;
diff --git a/common/smoke-tests/src/main/java/com/azure/StorageBlob.java b/common/smoke-tests/src/main/java/com/azure/smoketest/StorageBlob.java
similarity index 98%
rename from common/smoke-tests/src/main/java/com/azure/StorageBlob.java
rename to common/smoke-tests/src/main/java/com/azure/smoketest/StorageBlob.java
index 5ef7cb762e54..0f28776d462c 100644
--- a/common/smoke-tests/src/main/java/com/azure/StorageBlob.java
+++ b/common/smoke-tests/src/main/java/com/azure/smoketest/StorageBlob.java
@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
-package com.azure;
+package com.azure.smoketest;
 
 import com.azure.storage.blob.BlobClient;
 import com.azure.storage.blob.BlobServiceClientBuilder;
diff --git a/common/smoke-tests/src/main/java/module-info.java b/common/smoke-tests/src/main/java/module-info.java
new file mode 100644
index 000000000000..19d3fa853c0e
--- /dev/null
+++ b/common/smoke-tests/src/main/java/module-info.java
@@ -0,0 +1,9 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+module com.azure.smoketest {
+    requires transitive com.azure.messaging.eventhubs;
+    requires transitive com.azure.security.keyvault.secrets;
+    requires transitive com.azure.storage.blob;
+    requires transitive com.azure.identity;
+}