diff --git a/test/base/interactor.py b/test/base/interactor.py
index 8421506a67c..04012a34f71 100644
--- a/test/base/interactor.py
+++ b/test/base/interactor.py
@@ -64,6 +64,7 @@ class GalaxyInteractorApi( object ):
         fetcher = self.__dataset_fetcher( history_id )
         ## TODO: Twill version verifys dataset is 'ok' in here.
         self.twill_test_case.verify_hid( outfile, hda_id=hid, attributes=attributes, dataset_fetcher=fetcher, shed_tool_id=shed_tool_id )
+        self._verify_metadata( history_id, hid, attributes )
 
         primary_datasets = attributes.get( 'primary_datasets', {} )
         if primary_datasets:
@@ -86,8 +87,6 @@ class GalaxyInteractorApi( object ):
             self.twill_test_case.verify_hid( primary_outfile, hda_id=primary_hda_id, attributes=primary_attributes, dataset_fetcher=fetcher, shed_tool_id=shed_tool_id )
             self._verify_metadata( history_id, primary_hda_id, primary_attributes )
 
-        self._verify_metadata( history_id, hid, attributes )
-
     def _verify_metadata( self, history_id, hid, attributes ):
         metadata = attributes.get( 'metadata', {} ).copy()
         for key, value in metadata.copy().iteritems():