diff --git a/cdap-e2e-tests/src/e2e-test/features/Hub/DesignTime.feature b/cdap-e2e-tests/src/e2e-test/features/Hub/DesignTime.feature
index 52a3a441b7cd..23b0e4f9ee92 100644
--- a/cdap-e2e-tests/src/e2e-test/features/Hub/DesignTime.feature
+++ b/cdap-e2e-tests/src/e2e-test/features/Hub/DesignTime.feature
@@ -18,13 +18,13 @@ Feature: Hub - Design time scenarios
   @TS-HUB-DESIGN-01
   Scenario: Verify that the user is able to successfully navigate to the Hub page
     When Open Datafusion Project to configure pipeline
-    And Click on Hub button
-    And Verify that user is navigated to hub page successfully
+    Then Click on Hub button
+    Then Verify that user is navigated to hub page successfully
     Then Click on close button
 
   @TS-HUB-DESIGN-02
   Scenario: Verify that the user is getting an error message for an invalid search
     When Open Datafusion Project to configure pipeline
-    And Click on Hub button
-    And Enter the text in search tab "invalidMessage"
-    Then Verify that search displaying an error message: "invalid-message" on the header
+    Then Click on Hub button
+    Then Enter the text in search tab "invalidMessage_hub"
+    Then Verify that search displaying an error message: "invalid.message_hub" on the header
diff --git a/cdap-e2e-tests/src/e2e-test/features/Hub/Runtime.feature b/cdap-e2e-tests/src/e2e-test/features/Hub/Runtime.feature
index 96f33bfc1c46..d03f4e6d55a1 100644
--- a/cdap-e2e-tests/src/e2e-test/features/Hub/Runtime.feature
+++ b/cdap-e2e-tests/src/e2e-test/features/Hub/Runtime.feature
@@ -16,12 +16,16 @@
 Feature: Hub - Run time scenarios
 
   @TS-HUB-RNTM-01
-  Scenario: Verify that the user is able to deploy and delete a plugin
+  Scenario: Verify that the user is able to deploy a plugin in Hub and then delete it successfully
     When Open Datafusion Project to configure pipeline
-    And Click on Hub button
-    And Click on "Plugins" option
-    And Enter the text in search tab "Anaplan"
-    And Click on "Anaplan plugins" plugin
-    And Deploy the plugin
-    And Verify that "Anaplan" plugin is successfully deployed
-    Then Verify user can click on the delete icon of the plugin and plugin gets deleted successfully
+    Then Click on Hub Menu
+    Then Click on "Plugins" option
+    Then Enter the text in search tab "Anaplan"
+    Then Click on "Anaplan plugins" plugin
+    Then Deploy the plugin
+    Then Verify that "Anaplan" plugin is successfully deployed
+    Then Enter the text in search tab "anaplan" in control center
+    Then Select dropdown : "Filter" with option value: "Artifacts" in control center
+    Then Click on delete button to delete the plugin
+    Then Verify that plugin is successfully deleted
+
diff --git a/cdap-e2e-tests/src/e2e-test/resources/errorMessage.properties b/cdap-e2e-tests/src/e2e-test/resources/errorMessage.properties
index 7e6e71924eaf..23f1f85c1b8a 100644
--- a/cdap-e2e-tests/src/e2e-test/resources/errorMessage.properties
+++ b/cdap-e2e-tests/src/e2e-test/resources/errorMessage.properties
@@ -1 +1 @@
-invalid-message=No entities found
\ No newline at end of file
+invalid.message_hub=No entities found
\ No newline at end of file
diff --git a/cdap-e2e-tests/src/e2e-test/resources/pluginParameters.properties b/cdap-e2e-tests/src/e2e-test/resources/pluginParameters.properties
index 15a8459ef0b7..a5c8c1ea8816 100644
--- a/cdap-e2e-tests/src/e2e-test/resources/pluginParameters.properties
+++ b/cdap-e2e-tests/src/e2e-test/resources/pluginParameters.properties
@@ -3,8 +3,11 @@ clientUrl=http://localhost:11011
 serverUrl=https://placeholder.com/api
 # command to generate token: gcloud auth print-access-token
 serverAccessToken=placeholder
+
+## HUB-PROPERTIES-START
 expectedPluginName=Anaplan
 expectedElement=HUB
-invalidMessage=sfts
+invalidMessage_hub=sfts
 Artifacts=Artifacts-input
+## HUB-PROPERTIES-END