diff --git a/lib/galaxy_test/api/test_workflows.py b/lib/galaxy_test/api/test_workflows.py
index 8572f2e44f15..34959006e46a 100644
--- a/lib/galaxy_test/api/test_workflows.py
+++ b/lib/galaxy_test/api/test_workflows.py
@@ -2741,54 +2741,6 @@ def test_run_subworkflow_replacement_parameters(self):
             details = self.dataset_populator.get_history_dataset_details(history_id)
             assert details["name"] == "moocow suffix"
 
-    @skip_without_tool("create_2")
-    def test_placements_from_text_inputs(self):
-        with self.dataset_populator.test_history() as history_id:
-            run_def = """
-class: GalaxyWorkflow
-inputs: []
-steps:
-  create_2:
-    tool_id: create_2
-    state:
-      sleep_time: 0
-    outputs:
-      out_file1:
-        rename: "${replaceme} name"
-      out_file2:
-        rename: "${replaceme} name 2"
-test_data:
-  replacement_parameters:
-    replaceme: moocow
-"""
-
-            self._run_jobs(run_def, history_id=history_id)
-            details = self.dataset_populator.get_history_dataset_details(history_id)
-            assert details["name"] == "moocow name 2"
-
-            run_def = """
-class: GalaxyWorkflow
-inputs:
-  replaceme: text
-steps:
-  create_2:
-    tool_id: create_2
-    state:
-      sleep_time: 0
-    outputs:
-      out_file1:
-        rename: "${replaceme} name"
-      out_file2:
-        rename: "${replaceme} name 2"
-test_data:
-  replaceme:
-    value: moocow
-    type: raw
-"""
-            self._run_jobs(run_def, history_id=history_id)
-            details = self.dataset_populator.get_history_dataset_details(history_id)
-            assert details["name"] == "moocow name 2", details["name"]
-
     def test_placements_from_text_inputs_nested(self):
         with self.dataset_populator.test_history() as history_id:
             run_def = """
diff --git a/lib/galaxy_test/workflow/replacement_parameters_legacy.gxwf-tests.yml b/lib/galaxy_test/workflow/replacement_parameters_legacy.gxwf-tests.yml
new file mode 100644
index 000000000000..a3120f277072
--- /dev/null
+++ b/lib/galaxy_test/workflow/replacement_parameters_legacy.gxwf-tests.yml
@@ -0,0 +1,12 @@
+- doc: |
+    Test to verify legacy behavior of implicit runtime parameters continues to function correctly.
+  job:
+    replacement_parameters:
+      replaceme: moocow
+  outputs:
+    out1:
+      metadata:
+        name: 'moocow name'
+    out2:
+      metadata:
+        name: 'moocow name 2'
diff --git a/lib/galaxy_test/workflow/replacement_parameters_legacy.gxwf.yml b/lib/galaxy_test/workflow/replacement_parameters_legacy.gxwf.yml
new file mode 100644
index 000000000000..834721c3cc2b
--- /dev/null
+++ b/lib/galaxy_test/workflow/replacement_parameters_legacy.gxwf.yml
@@ -0,0 +1,17 @@
+class: GalaxyWorkflow
+inputs: {}
+outputs:
+  out1:
+    outputSource: create_2/out_file1
+  out2:
+    outputSource: create_2/out_file2
+steps:
+  create_2:
+    tool_id: create_2
+    state:
+      sleep_time: 0
+    outputs:
+      out_file1:
+        rename: "${replaceme} name"
+      out_file2:
+        rename: "${replaceme} name 2"
diff --git a/lib/galaxy_test/workflow/replacement_parameters_nested.gxwf-tests.yml b/lib/galaxy_test/workflow/replacement_parameters_nested.gxwf-tests.yml
new file mode 100644
index 000000000000..c5152f0e4add
--- /dev/null
+++ b/lib/galaxy_test/workflow/replacement_parameters_nested.gxwf-tests.yml
@@ -0,0 +1,13 @@
+- doc: |
+    Test to verify text parameters can be implicitly used as replacement parameters in subworkflows if they are connected up.
+  job:
+    replacemeouter: 
+      value: moocow
+      type: raw
+  outputs:
+    out1:
+      metadata:
+        name: 'moocow name'
+    out2:
+      metadata:
+        name: 'moocow name 2'
diff --git a/lib/galaxy_test/workflow/replacement_parameters_nested.gxwf.yml b/lib/galaxy_test/workflow/replacement_parameters_nested.gxwf.yml
new file mode 100644
index 000000000000..d783195ae584
--- /dev/null
+++ b/lib/galaxy_test/workflow/replacement_parameters_nested.gxwf.yml
@@ -0,0 +1,31 @@
+class: GalaxyWorkflow
+inputs:
+  replacemeouter: text
+outputs:
+  out1:
+    outputSource: nested_workflow/workflow_output_1
+  out2: 
+    outputSource: nested_workflow/workflow_output_2
+steps:
+  nested_workflow:
+    run:
+      class: GalaxyWorkflow
+      inputs:
+        replacemeinner: text
+      outputs:
+        workflow_output_1:
+          outputSource: create_2/out_file1
+        workflow_output_2:
+          outputSource: create_2/out_file2
+      steps:
+        create_2:
+          tool_id: create_2
+          state:
+            sleep_time: 0
+          outputs:
+            out_file1:
+              rename: "${replacemeinner} name"
+            out_file2:
+              rename: "${replacemeinner} name 2"
+    in:
+      replacemeinner: replacemeouter
diff --git a/lib/galaxy_test/workflow/replacement_parameters_text.gxwf-tests.yml b/lib/galaxy_test/workflow/replacement_parameters_text.gxwf-tests.yml
new file mode 100644
index 000000000000..b76353ae9325
--- /dev/null
+++ b/lib/galaxy_test/workflow/replacement_parameters_text.gxwf-tests.yml
@@ -0,0 +1,13 @@
+- doc: |
+    Test to verify text parameters can be implicitly used as replacement parameters in workflow step PJAs.
+  job:
+    replaceme: 
+      value: moocow
+      type: raw
+  outputs:
+    out1:
+      metadata:
+        name: 'moocow name'
+    out2:
+      metadata:
+        name: 'moocow name 2'
diff --git a/lib/galaxy_test/workflow/replacement_parameters_text.gxwf.yml b/lib/galaxy_test/workflow/replacement_parameters_text.gxwf.yml
new file mode 100644
index 000000000000..18f73aadb699
--- /dev/null
+++ b/lib/galaxy_test/workflow/replacement_parameters_text.gxwf.yml
@@ -0,0 +1,18 @@
+class: GalaxyWorkflow
+inputs:
+  replaceme: text
+outputs:
+  out1:
+    outputSource: create_2/out_file1
+  out2:
+    outputSource: create_2/out_file2
+steps:
+  create_2:
+    tool_id: create_2
+    state:
+      sleep_time: 0
+    outputs:
+      out_file1:
+        rename: "${replaceme} name"
+      out_file2:
+        rename: "${replaceme} name 2"