diff --git a/cdap-e2e-tests/src/e2e-test/features/namespaceadmin/NSAdminDesignTime.feature b/cdap-e2e-tests/src/e2e-test/features/namespaceadmin/NSAdminDesignTime.feature
index 8c236992c3de..416325aa67b7 100644
--- a/cdap-e2e-tests/src/e2e-test/features/namespaceadmin/NSAdminDesignTime.feature
+++ b/cdap-e2e-tests/src/e2e-test/features/namespaceadmin/NSAdminDesignTime.feature
@@ -17,20 +17,28 @@
 Feature: NameSpaceAdmin - Validate nameSpace admin design time scenarios
 
   @Namespaceadmin
-  Scenario:Verify user is able to click the nameSpace admin tab and successfully navigates to the page
+  Scenario:Verify user is able to click on the namespace admin tab and successfully navigates to the page
     Given Open Datafusion Project to configure pipeline
     When Click on the Hamburger bar on the left panel
     Then Click on NameSpace Admin link from the menu
     Then Verify that the user is navigated to nameSpace admin page successfully
 
   @Namespaceadmin
-  Scenario:Validate user is able to open compute profile page and select a provisioner
+  Scenario:Validate user is able to open compute profile page and create a profile for selected a provisioner
     Given Open Datafusion Project to configure pipeline
     Then Click on the Hamburger bar on the left panel
     Then Click on NameSpace Admin link from the menu
     Then Click on create profile button for "default" Namespace
-    Then Select a provisioner: "existingDataProc" for the compute profile
-    Then Click on close button of compute profile properties page
+    Then Select a provisioner: "remoteHadoopProvisioner" for the compute profile
+    Then Verify the Create a Profile page is loaded for selected provisioner
+    Then Enter input plugin property: "profileLabel" with value: "validProfile"
+    Then Enter textarea plugin property: "profileDescription" with value: "validDescription"
+    Then Enter input plugin property: "host" with value: "testHost"
+    Then Enter input plugin property: "user" with value: "testUser"
+    Then Enter textarea plugin property: "sshKey" with value: "testSSHKey"
+    Then Click on: "Create" button in the properties
+    Then Verify the created compute profile: "validProfile" is displayed in system compute profile list
+
 
   @Namespaceadmin
   Scenario: Validate user is able to create new namespace preferences and able to delete the added namespace preferences successfully
diff --git a/cdap-e2e-tests/src/e2e-test/features/namespaceadmin/NSAdminRunTime.feature b/cdap-e2e-tests/src/e2e-test/features/namespaceadmin/NSAdminRunTime.feature
index a7671a63c7e0..5d9e67bf9ad4 100644
--- a/cdap-e2e-tests/src/e2e-test/features/namespaceadmin/NSAdminRunTime.feature
+++ b/cdap-e2e-tests/src/e2e-test/features/namespaceadmin/NSAdminRunTime.feature
@@ -17,7 +17,7 @@
 Feature: NameSpaceAdmin - Validate nameSpace admin run time scenarios
 
   @BQ_SOURCE_TEST @BQ_SINK_TEST
-  Scenario:To verify user should be able to run a pipeline successfully using the NameSpace preferences created
+  Scenario:To verify if user is able to run a pipeline successfully using the namespace preferences
     Given Open Datafusion Project to configure pipeline
     Then Click on the Hamburger bar on the left panel
     Then Click on NameSpace Admin link from the menu
@@ -56,7 +56,7 @@ Feature: NameSpaceAdmin - Validate nameSpace admin run time scenarios
     Then Verify the pipeline status is "Succeeded"
 
   @BQ_SOURCE_TEST @BQ_SINK_TEST
-  Scenario: To verify User should be able to create a test connection inside Namespace admin and use it in any of the selected plugin Property.
+  Scenario: To verify if user is able to create a connection from namespace admin and configure it for required plugins
     Given Open Datafusion Project to configure pipeline
     Then Click on the Hamburger bar on the left panel
     Then Click on NameSpace Admin link from the menu
@@ -101,5 +101,3 @@ Feature: NameSpaceAdmin - Validate nameSpace admin run time scenarios
     Then Wait till pipeline is in running state
     Then Open and capture logs
     Then Verify the pipeline status is "Succeeded"
-
-
diff --git a/cdap-e2e-tests/src/e2e-test/resources/pluginParameters.properties b/cdap-e2e-tests/src/e2e-test/resources/pluginParameters.properties
index 900d8e6d3723..3a607a0b46c0 100644
--- a/cdap-e2e-tests/src/e2e-test/resources/pluginParameters.properties
+++ b/cdap-e2e-tests/src/e2e-test/resources/pluginParameters.properties
@@ -14,10 +14,8 @@ invalidNamespaceName=^%&&3%%
 validNamespaceDescription=Test Description
 invalidProfile=6*&gjh879
 invalidClusterName=$^%%&^GHJJH89
-validNamespaceName=AutoTestt
+validNamespaceName=AutoTest
 ConnectionName=TestConnection
 projectId=cdf-athena
 dataset=test_automation
-#bqSourceTable=dummy
-#bqTargetTable=dummy
-## NAMESPACEADMIN-PROPERTIES-END
\ No newline at end of file
+## NAMESPACEADMIN-PROPERTIES-END