diff --git a/test/functional/test_toolbox.py b/test/functional/test_toolbox.py
index 100aec63270..a6a4bfce513 100644
--- a/test/functional/test_toolbox.py
+++ b/test/functional/test_toolbox.py
@@ -24,12 +24,20 @@ class ToolTestCase( TwillTestCase ):
         all_inputs = dict( ( name, value ) for ( name, value, _ ) in self.testdef.inputs )
         # Do the first page
         page_inputs = dict( ( key, all_inputs[key] )
-                            for key in self.testdef.tool.inputs_by_page[0].keys() )        
+                            for key in self.testdef.tool.inputs_by_page[0].keys() )   
+             
         self.run_tool( self.testdef.tool.id, **page_inputs )
         # Do other pages if they exist
         for i in range( 1, self.testdef.tool.npages ):
-            page_inputs = dict( ( key, all_inputs[key] )
-                                for key in self.testdef.tool.inputs_by_page[i].keys() )
+            
+            page_inputs = dict()
+            
+            for key in self.testdef.tool.inputs_by_page[i].keys():
+                a_test_list = all_inputs[key].split(',')
+                if len(a_test_list) > 1:
+                    page_inputs[key] = a_test_list
+                else:
+                    page_inputs[key] = all_inputs[key]
             self.submit_form( **page_inputs )
         # Check the result
         assert len( self.testdef.outputs ) == 1, "ToolTestCase does not deal with multiple outputs properly yet."