diff --git a/system/testing/BaseTestCase.cfc b/system/testing/BaseTestCase.cfc
index 969f7fc98..a6ffd93eb 100755
--- a/system/testing/BaseTestCase.cfc
+++ b/system/testing/BaseTestCase.cfc
@@ -601,17 +601,14 @@ component extends="testbox.system.compat.framework.TestCase" accessors="true" {
 			.each( function( name ){
 				mockedEvent.setValue( arguments.name, params[ arguments.name ] );
 			} );
-		mockedEvent.$(
-			method   = "getHTTPHeader",
-			callback = function( name, defaultValue ){
-				if ( headers.keyExists( arguments.name ) ) {
-					return headers[ arguments.name ];
-				}
-				if ( !isNull( arguments.defaultValue ) ) {
-					return arguments.defaultValue;
-				}
-			}
-		);
+		arguments.headers
+			.keyArray()
+			.each( function( name ){
+				mockedEvent
+					.$( "getHTTPHeader" )
+					.$args( arguments.name )
+					.$results( headers[ arguments.name ] );
+			} );
 		return this.execute( argumentCollection = arguments );
 	}