diff --git a/lib/galaxy/tools/wrappers.py b/lib/galaxy/tools/wrappers.py
index 6f10b668031..79f3883c70c 100644
--- a/lib/galaxy/tools/wrappers.py
+++ b/lib/galaxy/tools/wrappers.py
@@ -108,7 +108,7 @@ class InputValueWrapper(ToolParameterValueWrapper):
         return getattr(self.value, key)
 
     def __int__(self):
-        return int(str(self))
+        return int(float(self))
 
     def __float__(self):
         return float(str(self))
diff --git a/test/functional/tools/cheetah_casting.xml b/test/functional/tools/cheetah_casting.xml
index d12bb6569e8..ab9c7606158 100644
--- a/test/functional/tools/cheetah_casting.xml
+++ b/test/functional/tools/cheetah_casting.xml
@@ -1,9 +1,11 @@
 <tool id="cheetah_casting" name="cheetah_casting" version="1.0.0">
     <command>
         #set $int_val_inc = int($inttest) + 1
+        #set $int_flot_val_inc = int($floattest) + 1
         #set $float_val_inc = float($floattest) + 1
-        echo $int_val_inc   >> $out_file1;
-        echo $float_val_inc >> $out_file1;
+        echo $int_val_inc   >> '$out_file1';
+        echo $int_flot_val_inc >> '$out_file1';
+        echo $float_val_inc >> '$out_file1';
     </command>
     <inputs>
         <param name="inttest" value="1" type="integer" />
@@ -19,6 +21,7 @@
             <output name="out_file1">
                 <assert_contents>
                     <has_line line="2" />
+                    <has_line line="3" />
                     <has_line line="3.5" />
                 </assert_contents>
             </output>