diff --git a/modules/swagger-codegen/src/main/resources/JMeter/api.mustache b/modules/swagger-codegen/src/main/resources/JMeter/api.mustache
index b52f7f3b97c..f0c67670e5d 100644
--- a/modules/swagger-codegen/src/main/resources/JMeter/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/JMeter/api.mustache
@@ -26,7 +26,7 @@
         <collectionProp name="Arguments.arguments">
           <elementProp name="testCases" elementType="Argument">
             <stringProp name="Argument.name">testCases</stringProp>
-            <stringProp name="Argument.value">${__P(host,10)}</stringProp>
+            <stringProp name="Argument.value">${__P(testCases,10)}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="host" elementType="Argument">
@@ -90,7 +90,7 @@
             <collectionProp name="Arguments.arguments">{{#queryParams}}
               <elementProp name="{{paramName}}" elementType="HTTPArgument">
                 <boolProp name="HTTPArgument.always_encode">false</boolProp>
-                <stringProp name="Argument.value">0</stringProp>
+                {{=<% %>=}}<stringProp name="Argument.value">${<% paramName %>}</stringProp><%={{ }}=%>
                 <stringProp name="Argument.metadata">=</stringProp>
                 <boolProp name="HTTPArgument.use_equals">true</boolProp>
                 <stringProp name="Argument.name">{{paramName}}</stringProp>