diff --git a/.travis.yml b/.travis.yml
index 95de9493b..a899701d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ install:
   - pip install $DJANGO 
   - pip install -e . --use-mirrors
   - pip install -r requirements.txt
+  - pip install coverage==3.5.1 --use-mirrors
 
 script:
   - python setup.py test
diff --git a/djangorestframework/decorators.py b/djangorestframework/decorators.py
index 314ea6350..814f321a6 100644
--- a/djangorestframework/decorators.py
+++ b/djangorestframework/decorators.py
@@ -6,6 +6,7 @@ from djangorestframework import exceptions
 from djangorestframework import status
 from djangorestframework.response import Response
 from djangorestframework.request import Request
+from djangorestframework.settings import api_settings
 
 
 def api_view(allowed_methods):
@@ -34,7 +35,8 @@ def api_view(allowed_methods):
 
                 if isinstance(response, Response):
                     response.request = request
-
+                    if api_settings.FORMAT_SUFFIX_KWARG:
+                        response.format = kwargs.get(api_settings.FORMAT_SUFFIX_KWARG, None)
                 return response
 
             except exceptions.APIException as exc: