diff --git a/raven/utils/serializer/base.py b/raven/utils/serializer/base.py
index 92b2102d8..465d0d1dd 100644
--- a/raven/utils/serializer/base.py
+++ b/raven/utils/serializer/base.py
@@ -167,21 +167,22 @@ class BooleanSerializer(Serializer):
     types = (bool,)
 
     def serialize(self, value, **kwargs):
-        return bool(value)
+        return repr(bool(value))
 
 
 class FloatSerializer(Serializer):
     types = (float,)
 
     def serialize(self, value, **kwargs):
-        return float(value)
+        # Wrap with repr to convert inf/nan to string
+        return repr(float(value))
 
 
 class IntegerSerializer(Serializer):
     types = (int,)
 
     def serialize(self, value, **kwargs):
-        return int(value)
+        return repr(int(value))
 
 
 class FunctionSerializer(Serializer):
@@ -197,7 +198,7 @@ class LongSerializer(Serializer):
         types = (long,)  # noqa
 
         def serialize(self, value, **kwargs):
-            return long(value)  # noqa
+            return repr(long(value))  # noqa
 
 
 # register all serializers, order matters
diff --git a/tests/base/tests.py b/tests/base/tests.py
index df032783e..dfaf64581 100644
--- a/tests/base/tests.py
+++ b/tests/base/tests.py
@@ -307,6 +307,18 @@ def test_exception_event(self):
         self.assertEquals(frame['function'], 'test_exception_event')
         self.assertTrue('timestamp' in event)
 
+    def test_exception_nan_in_vars(self):
+        try:
+            foo = float("nan")  # noqa
+            raise ValueError("foo")
+        except ValueError:
+            self.client.captureException()
+
+        event, = self.client.events
+        exc, = event['exception']['values']
+        frame, = exc['stacktrace']['frames']
+        assert frame['vars']['foo'] == "nan"
+
     def test_exception_event_true_exc_info(self):
         try:
             raise ValueError('foo')
diff --git a/tests/utils/encoding/tests.py b/tests/utils/encoding/tests.py
index 50c186a15..08f9387ac 100644
--- a/tests/utils/encoding/tests.py
+++ b/tests/utils/encoding/tests.py
@@ -65,21 +65,18 @@ def test_bad_string(self):
 
     def test_float(self):
         result = transform(13.0)
-        self.assertEqual(type(result), float)
-        self.assertEqual(result, 13.0)
+        self.assertEqual(result, "13.0")
 
     def test_bool(self):
         result = transform(True)
-        self.assertEqual(type(result), bool)
-        self.assertEqual(result, True)
+        self.assertEqual(result, 'True')
 
     def test_int_subclass(self):
         class X(int):
             pass
 
         result = transform(X())
-        self.assertEqual(type(result), int)
-        self.assertEqual(result, 0)
+        self.assertEqual(result, '0')
 
     def test_dict_keys(self):
         x = {'foo': 'bar'}
@@ -176,7 +173,7 @@ def test_recursion_max_depth(self):
     def test_list_max_length(self):
         x = list(range(10))
         result = transform(x, list_max_length=3)
-        self.assertEqual(result, (0, 1, 2))
+        self.assertEqual(result, ('0', '1', '2'))
 
     def test_dict_max_length(self):
         x = dict((x, x) for x in range(10))