diff --git a/modules/openapi-generator/src/main/resources/jmeter-client/api.mustache b/modules/openapi-generator/src/main/resources/jmeter-client/api.mustache
index 02675582c108..60ec78c155dd 100644
--- a/modules/openapi-generator/src/main/resources/jmeter-client/api.mustache
+++ b/modules/openapi-generator/src/main/resources/jmeter-client/api.mustache
@@ -93,7 +93,23 @@
             <elementProp name="" elementType="Header">
               <stringProp name="Header.name">accept</stringProp>
               <stringProp name="Header.value">{{{mediaType}}}</stringProp>
-            </elementProp>{{/produces.0}}
+            </elementProp>{{/produces.0}}{{#authMethods}}{{#isBasic}}{{#isBasicBasic}}
+            <elementProp name="" elementType="Header">
+              <stringProp name="Header.name">Authorization</stringProp>
+              <stringProp name="Header.value">Basic ${__P(basicBasicToken,token)}</stringProp>
+            </elementProp>{{/isBasicBasic}}{{#isBasicBearer}}
+            <elementProp name="" elementType="Header">
+              <stringProp name="Header.name">Authorization</stringProp>
+              <stringProp name="Header.value">Bearer ${__P(basicBearerToken,token)}</stringProp>
+            </elementProp>{{/isBasicBearer}}{{/isBasic}}{{#isApiKey}}{{#isKeyInHeader}}
+            <elementProp name="" elementType="Header">
+              <stringProp name="Header.name">{{keyParamName}}</stringProp>
+              <stringProp name="Header.value">${__P(apiKey,key)}</stringProp>
+            </elementProp>{{/isKeyInHeader}}{{/isApiKey}}{{#isOAuth}}
+            <elementProp name="" elementType="Header">
+              <stringProp name="Header.name">{{keyParamName}}</stringProp>
+              <stringProp name="Header.value">Bearer ${__P(oathToken,token)}</stringProp>
+            </elementProp>{{/isOAuth}}{{/authMethods}}
           </collectionProp>
         </HeaderManager>
         <hashTree/>
@@ -112,7 +128,14 @@
                 <boolProp name="HTTPArgument.always_encode">false</boolProp>
                 {{=<% %>=}}<stringProp name="Argument.value">${<% paramName %>}</stringProp><%={{ }}=%>
                 <stringProp name="Argument.metadata">=</stringProp>
-              </elementProp>{{/bodyParam}}
+              </elementProp>{{/bodyParam}}{{#authMethods}}{{#isApiKey}}{{#isKeyInQuery}}
+              <elementProp name="{{keyParamName}}" elementType="HTTPArgument">
+                <boolProp name="HTTPArgument.always_encode">false</boolProp>
+                <stringProp name="Argument.value">${__P(apiKey,key)}</stringProp>
+                <stringProp name="Argument.metadata">=</stringProp>
+                <boolProp name="HTTPArgument.use_equals">true</boolProp>
+                <stringProp name="Argument.name">{{keyParamName}}</stringProp>
+              </elementProp>{{/isKeyInQuery}}{{/isApiKey}}{{/authMethods}}
             </collectionProp>
           </elementProp>
           <stringProp name="HTTPSampler.domain"></stringProp>
diff --git a/samples/client/petstore/jmeter/PetApi.jmx b/samples/client/petstore/jmeter/PetApi.jmx
index 6624d24e38fb..1bc21baf5eb1 100644
--- a/samples/client/petstore/jmeter/PetApi.jmx
+++ b/samples/client/petstore/jmeter/PetApi.jmx
@@ -121,6 +121,10 @@
               <stringProp name="Header.name">Content-Type</stringProp>
               <stringProp name="Header.value">application/json</stringProp>
             </elementProp>
+            <elementProp name="" elementType="Header">
+              <stringProp name="Header.name"></stringProp>
+              <stringProp name="Header.value">Bearer ${__P(oathToken,token)}</stringProp>
+            </elementProp>
           </collectionProp>
         </HeaderManager>
         <hashTree/>
@@ -197,6 +201,10 @@
               <stringProp name="Header.name">apiKey</stringProp>
               <stringProp name="Header.value">${__RandomString(10,qwertyuiopasdfghjklzxcvbnm)}</stringProp>
             </elementProp>
+            <elementProp name="" elementType="Header">
+              <stringProp name="Header.name"></stringProp>
+              <stringProp name="Header.value">Bearer ${__P(oathToken,token)}</stringProp>
+            </elementProp>
           </collectionProp>
         </HeaderManager>
         <hashTree/>
@@ -268,6 +276,10 @@
               <stringProp name="Header.name">accept</stringProp>
               <stringProp name="Header.value">application/xml</stringProp>
             </elementProp>
+            <elementProp name="" elementType="Header">
+              <stringProp name="Header.name"></stringProp>
+              <stringProp name="Header.value">Bearer ${__P(oathToken,token)}</stringProp>
+            </elementProp>
           </collectionProp>
         </HeaderManager>
         <hashTree/>
@@ -346,6 +358,10 @@
               <stringProp name="Header.name">accept</stringProp>
               <stringProp name="Header.value">application/xml</stringProp>
             </elementProp>
+            <elementProp name="" elementType="Header">
+              <stringProp name="Header.name"></stringProp>
+              <stringProp name="Header.value">Bearer ${__P(oathToken,token)}</stringProp>
+            </elementProp>
           </collectionProp>
         </HeaderManager>
         <hashTree/>
@@ -424,6 +440,10 @@
               <stringProp name="Header.name">accept</stringProp>
               <stringProp name="Header.value">application/xml</stringProp>
             </elementProp>
+            <elementProp name="" elementType="Header">
+              <stringProp name="Header.name">api_key</stringProp>
+              <stringProp name="Header.value">${__P(apiKey,key)}</stringProp>
+            </elementProp>
           </collectionProp>
         </HeaderManager>
         <hashTree/>
@@ -495,6 +515,10 @@
               <stringProp name="Header.name">Content-Type</stringProp>
               <stringProp name="Header.value">application/json</stringProp>
             </elementProp>
+            <elementProp name="" elementType="Header">
+              <stringProp name="Header.name"></stringProp>
+              <stringProp name="Header.value">Bearer ${__P(oathToken,token)}</stringProp>
+            </elementProp>
           </collectionProp>
         </HeaderManager>
         <hashTree/>
@@ -571,6 +595,10 @@
               <stringProp name="Header.name">Content-Type</stringProp>
               <stringProp name="Header.value">application/x-www-form-urlencoded</stringProp>
             </elementProp>
+            <elementProp name="" elementType="Header">
+              <stringProp name="Header.name"></stringProp>
+              <stringProp name="Header.value">Bearer ${__P(oathToken,token)}</stringProp>
+            </elementProp>
           </collectionProp>
         </HeaderManager>
         <hashTree/>
@@ -646,6 +674,10 @@
               <stringProp name="Header.name">accept</stringProp>
               <stringProp name="Header.value">application/json</stringProp>
             </elementProp>
+            <elementProp name="" elementType="Header">
+              <stringProp name="Header.name"></stringProp>
+              <stringProp name="Header.value">Bearer ${__P(oathToken,token)}</stringProp>
+            </elementProp>
           </collectionProp>
         </HeaderManager>
         <hashTree/>
diff --git a/samples/client/petstore/jmeter/StoreApi.jmx b/samples/client/petstore/jmeter/StoreApi.jmx
index 8113bd3c3cac..48a114769d19 100644
--- a/samples/client/petstore/jmeter/StoreApi.jmx
+++ b/samples/client/petstore/jmeter/StoreApi.jmx
@@ -168,6 +168,10 @@
               <stringProp name="Header.name">accept</stringProp>
               <stringProp name="Header.value">application/json</stringProp>
             </elementProp>
+            <elementProp name="" elementType="Header">
+              <stringProp name="Header.name">api_key</stringProp>
+              <stringProp name="Header.value">${__P(apiKey,key)}</stringProp>
+            </elementProp>
           </collectionProp>
         </HeaderManager>
         <hashTree/>