diff --git a/docs/api.rst b/docs/api.rst
index 8d64e0f..e5db642 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -76,7 +76,7 @@ The ``FitFile`` Object
                 try:
                     fitfile = FitFile('/path.to/fitfile.fit')
                     fitfile.parse()
-                except FitParseError, e:
+                except FitParseError as e:
                     print "Error while parsing .FIT file: %s" % e
                     sys.exit(1)
 
diff --git a/tests/test.py b/tests/test.py
index 886f21f..77082fb 100755
--- a/tests/test.py
+++ b/tests/test.py
@@ -74,6 +74,7 @@ def testfile(filename):
 
 
 class FitFileTestCase(unittest.TestCase):
+
     def test_basic_file_with_one_record(self, endian='<'):
         f = FitFile(generate_fitfile(endian=endian))
         f.parse()
@@ -414,7 +415,11 @@ def test_mismatched_field_size(self):
         with warnings.catch_warnings(record=True) as w:
             f.parse()
             assert w
-            assert all("falling back to byte encoding" in str(x) for x in w)
+            assert all(
+                "falling back to byte encoding" in str(x)
+                for x in w
+                if x.category == UserWarning
+            )
         self.assertEqual(len(f.messages), 11293)
 
     def test_unterminated_file(self):