diff --git a/test/selenium/workflow/CreateWorkflowWithGroupingAndRuntimeParameters.html b/test/selenium/workflow/CreateWorkflowWithGroupingAndRuntimeParameters.html
index cd60872cf22..9650a4cba81 100644
--- a/test/selenium/workflow/CreateWorkflowWithGroupingAndRuntimeParameters.html
+++ b/test/selenium/workflow/CreateWorkflowWithGroupingAndRuntimeParameters.html
@@ -12,13 +12,8 @@
 <tr><td rowspan="1" colspan="3">Create Workflow With Grouping And Runtime Parameters</td></tr>
 </thead><tbody>
 <tr>
-	<td>setSpeed</td>
-	<td>100</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Workflow</td>
+	<td>open</td>
+	<td>/workflow</td>
 	<td></td>
 </tr>
 <tr>
@@ -52,23 +47,18 @@
 	<td></td>
 </tr>
 <tr>
-	<td>waitForNotVisible</td>
-	<td>overlay</td>
+	<td>click</td>
+	<td>//div[@id='title___workflow__input__']/a/span</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>//div[@id='title_group']/a/span</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>link-Grouping1</td>
+	<td>link=Input dataset</td>
 	<td></td>
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
-	<td>wf-node-step-1</td>
+	<td>//div[@id='wf-node-step-1']/div[1]</td>
 	<td></td>
 </tr>
 <tr>
@@ -88,7 +78,17 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>link-Grouping1</td>
+	<td>//div[@id='title_bxops']/a/span</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>link-gops_complement_1</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>//div[@id='wf-node-step-2']/div[1]</td>
 	<td></td>
 </tr>
 <tr>
@@ -108,7 +108,17 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>link-Grouping1</td>
+	<td>//div[@id='title_plots']/a/span</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>link-build_ucsc_custom_track_1</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>//div[@id='wf-node-step-3']/div[1]</td>
 	<td></td>
 </tr>
 <tr>
@@ -127,95 +137,30 @@
 	<td>300,300</td>
 </tr>
 <tr>
-	<td>clickAt</td>
-	<td>//div[@id='wf-node-step-1']/div[1]</td>
+	<td>click</td>
+	<td>tracks_add</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>//div[@name='tracks_0|input']</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>popup-arrow-for-row-groupcol</td>
+	<td>popup-arrow-for-row-tracks_0|name</td>
 	<td></td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>//div[@id='popup-arrow-for-row-groupcol-menu']/div</td>
+	<td>//div[@id='popup-arrow-for-row-tracks_0|name-menu']/div</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForText</td>
-	<td>//div[@id='right-content']/div/div[2]/form/div[2]/div[1]/i</td>
+	<td>verifyText</td>
+	<td>//div[@id='row-tracks_0|name']/div[1]/i</td>
 	<td>To be set at runtime</td>
 </tr>
-<tr>
-	<td>click</td>
-	<td>operations_add</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>tool-form-save-button</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAt</td>
-	<td>//div[@id='wf-node-step-2']/div[1]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>operations_add</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>//div[@id='right-content']/div/div[2]/form/div[3]/div[2]/div[1]/b</td>
-	<td>Operation 1</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>operations_0|opcol</td>
-	<td>3</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>operations_add</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForText</td>
-	<td>//div[@id='right-content']/div/div[2]/form/div[3]/div[3]/div[1]/b</td>
-	<td>Operation 2</td>
-</tr>
-<tr>
-	<td>type</td>
-	<td>operations_1|opcol</td>
-	<td>4</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>tool-form-save-button</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyValue</td>
-	<td>operations_0|opcol</td>
-	<td>3</td>
-</tr>
-<tr>
-	<td>verifyValue</td>
-	<td>operations_1|opcol</td>
-	<td>4</td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>operations_0_remove</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyValue</td>
-	<td>operations_1|opcol</td>
-	<td>4</td>
-</tr>
 <tr>
 	<td>click</td>
 	<td>tool-form-save-button</td>
@@ -223,7 +168,7 @@
 </tr>
 <tr>
 	<td>mouseDownAt</td>
-	<td>//div[@id='wf-node-step-1']/div[2]/div[3]/div</td>
+	<td>//div[@id='wf-node-step-1']/div[2]/div[2]/div</td>
 	<td></td>
 </tr>
 <tr>
@@ -238,7 +183,7 @@
 </tr>
 <tr>
 	<td>mouseDownAt</td>
-	<td>//div[@id='wf-node-step-1']/div[2]/div[3]/div</td>
+	<td>//div[@id='wf-node-step-2']/div[2]/div[3]/div</td>
 	<td></td>
 </tr>
 <tr>
@@ -257,14 +202,14 @@
 	<td></td>
 </tr>
 <tr>
-	<td>click</td>
-	<td>close-button</td>
+	<td>waitForNotVisible</td>
+	<td>overlay</td>
 	<td></td>
 </tr>
 <tr>
-	<td>verifyText</td>
-	<td>//div[@id='right-content']/div/div[2]/form/div[3]/div[2]/div[1]/b</td>
-	<td>Operation 1</td>
+	<td>clickAndWait</td>
+	<td>close-button</td>
+	<td></td>
 </tr>
 
 </tbody></table>
diff --git a/test/selenium/workflow/RunWorkflowWithGroupingAndRuntimeParameters.html b/test/selenium/workflow/RunWorkflowWithGroupingAndRuntimeParameters.html
new file mode 100644
index 00000000000..fb4b2dd52c8
--- /dev/null
+++ b/test/selenium/workflow/RunWorkflowWithGroupingAndRuntimeParameters.html
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="" />
+<title>Run Workflow with Grouping</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Run Workflow with Grouping</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/workflow</td>
+	<td></td>
+</tr>
+<tr>
+	<td>selectFrame</td>
+	<td>galaxy_main</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>wf-0-popup</td>
+	<td></td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>//div[@id='wf-0-popup-menu']/div[2]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>selectFrame</td>
+	<td>galaxy_main</td>
+	<td></td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>//form[@id='tool_form']/div[3]/div[2]/div/div[2]/div[3]/div[1]/input[1]</td>
+	<td>Title set at runtime</td>
+</tr>
+<tr>
+	<td>select</td>
+	<td>//form[@id='tool_form']/div[1]/div[2]/div/div[1]/select</td>
+	<td>label=1: 1.bed</td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>run_workflow</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Must have length no more than 15</td>
+	<td></td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>//form[@id='tool_form']/div[3]/div[2]/div/div[2]/div[3]/div[1]/input[1]</td>
+	<td>Runtime</td>
+</tr>
+<tr>
+	<td>clickAndWait</td>
+	<td>run_workflow</td>
+	<td></td>
+</tr>
+<tr>
+	<td>selectFrame</td>
+	<td>relative=up</td>
+	<td></td>
+</tr>
+<tr>
+	<td>selectFrame</td>
+	<td>galaxy_history</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForTextPresent</td>
+	<td>exact:85 regions, format: bed, database: ?</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForTextPresent</td>
+	<td>exact:Info: Generated a custom track containing 1 subtracks.</td>
+	<td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/test/selenium/workflow/Suite.html b/test/selenium/workflow/Suite.html
index f94c335a6ee..c111996f61e 100644
--- a/test/selenium/workflow/Suite.html
+++ b/test/selenium/workflow/Suite.html
@@ -12,6 +12,7 @@
 <tr><td><a href="CreateSimpleWorkflow.html">Create Simple Workflow</a></td></tr>
 <tr><td><a href="VerifyRunSimpleWorkflow.html">Verify / Run Simple Workflow</a></td></tr>
 <tr><td><a href="CreateWorkflowWithGroupingAndRuntimeParameters.html">Create Workflow With Grouping And Runtime Parameters</a></td></tr>
+<tr><td><a href="RunWorkflowWithGroupingAndRuntimeParameters.html">Run Workflow with Grouping</a></td></tr>
 </tbody></table>
 </body>
 </html>