diff --git a/lib/galaxy/tools/wrappers.py b/lib/galaxy/tools/wrappers.py
index 1a483b66e74..9282f446935 100644
--- a/lib/galaxy/tools/wrappers.py
+++ b/lib/galaxy/tools/wrappers.py
@@ -98,6 +98,12 @@ class InputValueWrapper( ToolParameterValueWrapper ):
     def __getattr__( self, key ):
         return getattr( self.value, key )
 
+    def __int__(self):
+        return int(str(self))
+
+    def __float__(self):
+        return float(str(self))
+
 
 class SelectToolParameterWrapper( ToolParameterValueWrapper ):
     """
diff --git a/test/functional/tools/cheetah_casting.xml b/test/functional/tools/cheetah_casting.xml
new file mode 100644
index 00000000000..d12bb6569e8
--- /dev/null
+++ b/test/functional/tools/cheetah_casting.xml
@@ -0,0 +1,27 @@
+<tool id="cheetah_casting" name="cheetah_casting" version="1.0.0">
+    <command>
+        #set $int_val_inc = int($inttest) + 1
+        #set $float_val_inc = float($floattest) + 1
+        echo $int_val_inc   >> $out_file1;
+        echo $float_val_inc >> $out_file1;
+    </command>
+    <inputs>
+        <param name="inttest" value="1" type="integer" />
+        <param name="floattest" value="1.0" type="float" />
+    </inputs>
+    <outputs>
+        <data name="out_file1" format="txt" />
+    </outputs>
+    <tests>
+        <test>
+            <param name="inttest" value="1" />
+            <param name="floattest" value="2.5" />
+            <output name="out_file1">
+                <assert_contents>
+                    <has_line line="2" />
+                    <has_line line="3.5" />
+                </assert_contents>
+            </output>
+        </test>
+    </tests>
+</tool>
diff --git a/test/functional/tools/samples_tool_conf.xml b/test/functional/tools/samples_tool_conf.xml
index 22fbd8290b7..bd437eb7100 100644
--- a/test/functional/tools/samples_tool_conf.xml
+++ b/test/functional/tools/samples_tool_conf.xml
@@ -52,6 +52,8 @@
   <tool file="collection_optional_param.xml" />
   <tool file="collection_split_on_column.xml" />
 
+  <tool file="cheetah_casting.xml" />
+
   <tool file="multiple_versions_v01.xml" />
   <tool file="multiple_versions_v02.xml" />