diff --git a/lib/process-services/task-list/components/task-details.component.html b/lib/process-services/task-list/components/task-details.component.html
index d2cc2877ff..c349b5009d 100644
--- a/lib/process-services/task-list/components/task-details.component.html
+++ b/lib/process-services/task-list/components/task-details.component.html
@@ -57,6 +57,26 @@
                                      (complete)="onComplete()"
                                      (showAttachForm)="onShowAttachForm()">
                 </adf-task-standalone>
+
+                <mat-card class="adf-message-card" *ngIf="!isTaskStandaloneComponentVisible() && !isCompletedTask()" >
+                    <mat-card-content>
+                        <div class="adf-no-form-message-container">
+                            <div class="adf-no-form-message-list">
+                                <div *ngIf="!isCompletedTask()" class="adf-no-form-message">
+                                    <span id="adf-no-form-message">{{'ADF_TASK_LIST.STANDALONE_TASK.NO_FORM_MESSAGE' | translate}}</span>
+                                </div>
+                            </div>
+                        </div>
+                    </mat-card-content>
+
+                    <mat-card-actions class="adf-no-form-mat-card-actions">
+                        <div>
+                            <button mat-button id="adf-no-form-complete-button" color="primary" (click)="onComplete()">{{ 'ADF_TASK_LIST.DETAILS.BUTTON.COMPLETE' | translate }}</button>
+                        </div>
+                    </mat-card-actions>
+
+                </mat-card>
+
                 <adf-attach-form *ngIf="isShowAttachForm()"
                                  [taskId]="taskDetails.id"
                                  [formKey]="taskDetails.formKey"
diff --git a/lib/process-services/task-list/components/task-standalone.component.ts b/lib/process-services/task-list/components/task-standalone.component.ts
index e82f185b4a..a28b10c178 100644
--- a/lib/process-services/task-list/components/task-standalone.component.ts
+++ b/lib/process-services/task-list/components/task-standalone.component.ts
@@ -42,6 +42,7 @@ export class TaskStandaloneComponent {
     @Input()
     hasCompletePermission: boolean = true;
 
+    // TODO: rename all with show prefix
     /** Toggles rendering of the `Cancel` button. */
     @Input()
     hideCancelButton: boolean = true;
diff --git a/protractor.conf.js b/protractor.conf.js
index 2fddb9abce..4640f375ee 100644
--- a/protractor.conf.js
+++ b/protractor.conf.js
@@ -16,6 +16,13 @@ var BROWSER_RUN = process.env.BROWSER_RUN;
 var FOLDER = process.env.FOLDER || '';
 var SELENIUM_SERVER = process.env.SELENIUM_SERVER || '';
 var DIRECT_CONNECCT = SELENIUM_SERVER ? false : true;
+var NAME_TEST = process.env.NAME_TEST ? true : false
+
+var specsToRun = './e2e/' + FOLDER + '**/*.e2e.ts';
+
+if (process.env.NAME_TEST) {
+    specsToRun =   './e2e/**/' + process.env.NAME_TEST;
+}
 
 var args_options = [];
 
@@ -31,7 +38,7 @@ exports.config = {
     allScriptsTimeout: 60000,
 
     specs: [
-        './e2e/' + FOLDER + '**/*.e2e.ts'
+        specsToRun
     ],
 
     capabilities: {
diff --git a/scripts/test-e2e-lib.sh b/scripts/test-e2e-lib.sh
index 93e7e2547a..138ae2b98a 100755
--- a/scripts/test-e2e-lib.sh
+++ b/scripts/test-e2e-lib.sh
@@ -102,27 +102,16 @@ export SAVE_SCREENSHOT=$SAVE_SCREENSHOT
 export TIMEOUT=$TIMEOUT
 export FOLDER=$FOLDER'/'
 export SELENIUM_SERVER=$SELENIUM_SERVER
+export NAME_TEST=$NAME_TEST
 
 npm run lint-e2e || exit 1
 
 if [[  $DEVELOPMENT == "true" ]]; then
   echo "====== Run against local development  ====="
-  if [[  $SINGLE_TEST == "true" ]]; then
-    echo "====== Single test run $NAME_TEST ====="
-    npm run e2e-lib -- --specs ./e2e/$NAME_TEST || exit 1
-  else
     npm run e2e-lib || exit 1
-  fi
 else
-  if [[  $SINGLE_TEST == "true" ]]; then
-   npm install --save-dev jasmine2-protractor-utils -g
-    echo "====== Single test run $NAME_TEST ====="
-     webdriver-manager update --gecko=false --versions.chrome=2.38
-     ./node_modules/protractor/bin/protractor  protractor.conf.js  --specs ./e2e/$NAME_TEST || exit 1
-  else
      webdriver-manager update --gecko=false --versions.chrome=2.38
      ./node_modules/protractor/bin/protractor protractor.conf.js || exit 1
-  fi
 fi