diff --git a/lib/galaxy/tools/parameters/basic.py b/lib/galaxy/tools/parameters/basic.py
index f825b2223a1..d5061972ad8 100644
--- a/lib/galaxy/tools/parameters/basic.py
+++ b/lib/galaxy/tools/parameters/basic.py
@@ -1634,7 +1634,7 @@ class BaseDataToolParameter( ToolParameter ):
         class_name = self.__class__.__name__
         assert trans is not None, "%s requires a trans" % class_name
         if history is None:
-            history = trans.get_history()
+            history = trans.get_history( create=True )
         assert history is not None, "%s requires a history" % class_name
         return history
 
diff --git a/test/unit/tools/test_data_parameters.py b/test/unit/tools/test_data_parameters.py
index bf005a90458..062ace3551d 100644
--- a/test/unit/tools/test_data_parameters.py
+++ b/test/unit/tools/test_data_parameters.py
@@ -150,7 +150,7 @@ class DataToolParameterTestCase( BaseParameterTestCase ):
         self.app.model.context.flush()
         self.trans = bunch.Bunch(
             app=self.app,
-            get_history=lambda: self.test_history,
+            get_history=lambda **k: self.test_history,
             get_current_user_roles=lambda: [],
             workflow_building_mode=False,
             webapp=bunch.Bunch( name="galaxy" ),
diff --git a/test/unit/tools/test_execution.py b/test/unit/tools/test_execution.py
index 25890b3fd13..cab7989e85b 100644
--- a/test/unit/tools/test_execution.py
+++ b/test/unit/tools/test_execution.py
@@ -478,7 +478,7 @@ class MockTrans( object ):
         self.webapp = Bunch( name="galaxy" )
         self.sa_session = self.app.model.context
 
-    def get_history( self ):
+    def get_history( self, **kwargs ):
         return self.history
 
 
diff --git a/test/unit/unittest_utils/galaxy_mock.py b/test/unit/unittest_utils/galaxy_mock.py
index b06f65f61c4..128dbfde385 100644
--- a/test/unit/unittest_utils/galaxy_mock.py
+++ b/test/unit/unittest_utils/galaxy_mock.py
@@ -91,7 +91,7 @@ class MockTrans( object ):
 
     user = property( get_user, set_user )
 
-    def get_history( self ):
+    def get_history( self, **kwargs ):
         return self.history
 
     def set_history( self, history ):