diff --git a/test/api/test_tools.py b/test/api/test_tools.py
index 6d22aac5ded..5f37d07db05 100644
--- a/test/api/test_tools.py
+++ b/test/api/test_tools.py
@@ -149,7 +149,7 @@ class ToolsTestCase( api.ApiTestCase ):
             }
         }
         self.dataset_populator.wait_for_history( history_id, assert_ok=True )
-        response = self._run( "__UNZIP_COLLECTION__", history_id, inputs, assert_ok=True )
+        self._run( "__UNZIP_COLLECTION__", history_id, inputs, assert_ok=True )
 
     def test_zip_inputs( self ):
         history_id = self.dataset_populator.new_history()
diff --git a/test/unit/tools/test_data_parameters.py b/test/unit/tools/test_data_parameters.py
index 35f363b9ca0..930d5d92fcc 100644
--- a/test/unit/tools/test_data_parameters.py
+++ b/test/unit/tools/test_data_parameters.py
@@ -193,6 +193,7 @@ class MockHistoryDatasetAssociation( object ):
     def __init__( self, test_dataset=None, name="Test Dataset", id=1 ):
         if not test_dataset:
             test_dataset = model.Dataset()
+            test_dataset.state = model.Dataset.states.OK
         self.states = model.HistoryDatasetAssociation.states
         self.deleted = False
         self.dataset = test_dataset
diff --git a/test/unit/tools/test_dataset_matcher.py b/test/unit/tools/test_dataset_matcher.py
index e38c375a4d2..24fc9f1f849 100644
--- a/test/unit/tools/test_dataset_matcher.py
+++ b/test/unit/tools/test_dataset_matcher.py
@@ -131,6 +131,7 @@ class DatasetMatcherTestCase( TestCase, tools_support.UsesApp ):
         self.tool = bunch.Bunch(
             app=self.app,
             tool_type="default",
+            valid_input_states=model.Dataset.valid_input_states,
         )
         self.current_user_roles = []
         self.other_values = {}
diff --git a/test/unit/tools/test_parameter_parsing.py b/test/unit/tools/test_parameter_parsing.py
index 603b3436b17..cd92463a662 100644
--- a/test/unit/tools/test_parameter_parsing.py
+++ b/test/unit/tools/test_parameter_parsing.py
@@ -1,5 +1,6 @@
 from unittest import TestCase
 
+from galaxy import model
 from galaxy.tools.parameters import basic
 from galaxy.util import bunch
 from xml.etree.ElementTree import XML
@@ -14,6 +15,7 @@ class BaseParameterTestCase( TestCase, tools_support.UsesApp ):
         self.mock_tool = bunch.Bunch(
             app=self.app,
             tool_type="default",
+            valid_input_states=model.Dataset.valid_input_states,
         )
 
     def _parameter_for(self, **kwds):