diff --git a/src/test/groovy/org/prebid/server/functional/model/request/auction/ImpExtPrebid.groovy b/src/test/groovy/org/prebid/server/functional/model/request/auction/ImpExtPrebid.groovy
index fc771e59919..fda9915bb4e 100644
--- a/src/test/groovy/org/prebid/server/functional/model/request/auction/ImpExtPrebid.groovy
+++ b/src/test/groovy/org/prebid/server/functional/model/request/auction/ImpExtPrebid.groovy
@@ -19,6 +19,8 @@ class ImpExtPrebid {
     ImpExtPrebidFloors floors
     Map passThrough
     Map<BidderName, Imp> imp
+    @JsonProperty("adunitcode")
+    String adUnitCode
 
     static ImpExtPrebid getDefaultImpExtPrebid() {
         new ImpExtPrebid().tap {
diff --git a/src/test/groovy/org/prebid/server/functional/model/request/auction/Prebid.groovy b/src/test/groovy/org/prebid/server/functional/model/request/auction/Prebid.groovy
index ba89f5680fa..6a6ae093ea5 100644
--- a/src/test/groovy/org/prebid/server/functional/model/request/auction/Prebid.groovy
+++ b/src/test/groovy/org/prebid/server/functional/model/request/auction/Prebid.groovy
@@ -29,7 +29,7 @@ class Prebid {
     List<MultiBid> multibid
     Pbs pbs
     Server server
-    Map<BidderName, Map<String, Integer>> bidderParams
+    Map bidderParams
     ExtPrebidFloors floors
     Map passThrough
     Events events
diff --git a/src/test/groovy/org/prebid/server/functional/tests/BidderParamsSpec.groovy b/src/test/groovy/org/prebid/server/functional/tests/BidderParamsSpec.groovy
index cab50bd816b..6fdc0c8a2d5 100644
--- a/src/test/groovy/org/prebid/server/functional/tests/BidderParamsSpec.groovy
+++ b/src/test/groovy/org/prebid/server/functional/tests/BidderParamsSpec.groovy
@@ -780,6 +780,7 @@ class BidderParamsSpec extends BaseSpec {
         given: "Default bid request with populated imp.ext"
         def impExt = ImpExt.getDefaultImpExt().tap {
             prebid.bidder.generic = null
+            prebid.adUnitCode = PBSUtils.randomString
             generic = new Generic()
             ae = PBSUtils.randomNumber
             all = PBSUtils.randomNumber
@@ -795,9 +796,15 @@ class BidderParamsSpec extends BaseSpec {
         }
 
         when: "PBS processes auction request"
-        defaultPbsService.sendAuctionRequest(bidRequest)
+        def response = defaultPbsService.sendAuctionRequest(bidRequest)
+
+        then: "Response shouldn't contain error"
+        assert !response.ext?.errors
 
-        then: "Bidder request should contain same field as requested"
+        and: "Response shouldn't contain warning"
+        assert !response.ext?.warnings
+
+        and: "Bidder request should contain same field as requested"
         def bidderRequest = bidder.getBidderRequest(bidRequest.id)
         verifyAll(bidderRequest.imp[0].ext) {
             bidder == impExt.generic
@@ -809,7 +816,39 @@ class BidderParamsSpec extends BaseSpec {
             gpid == impExt.gpid
             skadn == impExt.skadn
             tid == impExt.tid
+            prebid.adUnitCode == impExt.prebid.adUnitCode
+        }
+    }
+
+    def "PBS should proceed auction without warning when all ext.prebid.bidderParams fields are known"() {
+        given: "Default bid request with populated ext.prebid.bidderParams"
+        def genericBidderParams = PBSUtils.randomString
+        def bidRequest = BidRequest.defaultBidRequest.tap {
+            ext.prebid.bidderParams = [ae             : PBSUtils.randomString,
+                                       all            : PBSUtils.randomString,
+                                       context        : PBSUtils.randomString,
+                                       data           : PBSUtils.randomString,
+                                       general        : PBSUtils.randomString,
+                                       gpid           : PBSUtils.randomString,
+                                       skadn          : PBSUtils.randomString,
+                                       tid            : PBSUtils.randomString,
+                                       adunitcode     : PBSUtils.randomString,
+                                       (GENERIC.value): genericBidderParams
+            ]
         }
+
+        when: "PBS processes auction request"
+        def response = defaultPbsService.sendAuctionRequest(bidRequest)
+
+        then: "Response shouldn't contain error"
+        assert !response.ext?.errors
+
+        and: "Response shouldn't contain warning"
+        assert !response.ext?.warnings
+
+        and: "Bidder request should bidderParams only for bidder"
+        def bidderRequest = bidder.getBidderRequest(bidRequest.id)
+        assert bidderRequest.ext.prebid.bidderParams == [(GENERIC.value): genericBidderParams]
     }
 
     def "PBS should send request to bidder when adapters.bidder.meta-info.currency-accepted not specified"() {
@@ -847,7 +886,7 @@ class BidderParamsSpec extends BaseSpec {
     def "PBS should send request to bidder when adapters.bidder.aliases.bidder.meta-info.currency-accepted not specified"() {
         given: "PBS with adapter configuration"
         def pbsService = pbsServiceFactory.getService(
-                "adapters.generic.aliases.alias.enabled" : "true",
+                "adapters.generic.aliases.alias.enabled": "true",
                 "adapters.generic.aliases.alias.endpoint": "$networkServiceContainer.rootUri/auction".toString(),
                 "adapters.generic.aliases.alias.meta-info.currency-accepted": "")
 
@@ -955,7 +994,7 @@ class BidderParamsSpec extends BaseSpec {
     def "PBS should send request to bidder when adapters.bidder.aliases.bidder.meta-info.currency-accepted intersect with requested currency"() {
         given: "PBS with adapter configuration"
         def pbsService = pbsServiceFactory.getService(
-                "adapters.generic.aliases.alias.enabled" : "true",
+                "adapters.generic.aliases.alias.enabled": "true",
                 "adapters.generic.aliases.alias.endpoint": "$networkServiceContainer.rootUri/auction".toString(),
                 "adapters.generic.aliases.alias.meta-info.currency-accepted": "${USD},${EUR}".toString())
 
@@ -996,7 +1035,7 @@ class BidderParamsSpec extends BaseSpec {
     def "PBS shouldn't send request to bidder and emit warning when adapters.bidder.aliases.bidder.meta-info.currency-accepted not intersect with requested currency"() {
         given: "PBS with adapter configuration"
         def pbsService = pbsServiceFactory.getService(
-                "adapters.generic.aliases.alias.enabled" : "true",
+                "adapters.generic.aliases.alias.enabled": "true",
                 "adapters.generic.aliases.alias.endpoint": "$networkServiceContainer.rootUri/auction".toString(),
                 "adapters.generic.aliases.alias.meta-info.currency-accepted": "${JPY},${CHF}".toString())