diff --git a/django/contrib/gis/gdal/tests/test_envelope.py b/django/contrib/gis/gdal/tests/test_envelope.py
index 6c0c13724c..f181fa237c 100644
--- a/django/contrib/gis/gdal/tests/test_envelope.py
+++ b/django/contrib/gis/gdal/tests/test_envelope.py
@@ -55,7 +55,7 @@ class EnvelopeTest(unittest.TestCase):
         self.assertEqual((0, 0, 5, 6), self.e) 
         self.e.expand_to_include(-1, -1) 
         self.assertEqual((-1, -1, 5, 6), self.e) 
- 		 
+  
     def test05_expand_to_include_pt_2_tuple(self): 
         "Testing Envelope expand_to_include -- point as a single 2-tuple parameter." 
         self.e.expand_to_include((10, 10)) 
@@ -67,17 +67,17 @@ class EnvelopeTest(unittest.TestCase):
         "Testing Envelope expand_to_include -- extent as 4 parameters." 
         self.e.expand_to_include(-1, 1, 3, 7) 
         self.assertEqual((-1, 0, 5, 7), self.e) 
- 		 
+  
     def test06_expand_to_include_extent_4_tuple(self): 
         "Testing Envelope expand_to_include -- extent as a single 4-tuple parameter." 
         self.e.expand_to_include((-1, 1, 3, 7)) 
         self.assertEqual((-1, 0, 5, 7), self.e) 
- 		 
+  
     def test07_expand_to_include_envelope(self): 
         "Testing Envelope expand_to_include with Envelope as parameter." 
         self.e.expand_to_include(Envelope(-1, 1, 3, 7)) 
         self.assertEqual((-1, 0, 5, 7), self.e) 
- 		 
+  
     def test08_expand_to_include_point(self): 
         "Testing Envelope expand_to_include with Point as parameter." 
         self.e.expand_to_include(TestPoint(-1, 1)) 
diff --git a/django/template/defaulttags.py b/django/template/defaulttags.py
index 300e249e35..7cbfda1935 100644
--- a/django/template/defaulttags.py
+++ b/django/template/defaulttags.py
@@ -603,7 +603,7 @@ def firstof(parser, token):
 
         {% filter force_escape %}
             {% firstof var1 var2 var3 "fallback value" %}
-	{% endfilter %}
+        {% endfilter %}
 
     """
     bits = token.split_contents()[1:]
diff --git a/tests/modeltests/proxy_models/models.py b/tests/modeltests/proxy_models/models.py
index 5621e6d692..4f0e78b6ba 100644
--- a/tests/modeltests/proxy_models/models.py
+++ b/tests/modeltests/proxy_models/models.py
@@ -98,18 +98,18 @@ class UserProxyProxy(UserProxy):
 
 # We can still use `select_related()` to include related models in our querysets.
 class Country(models.Model):
-	name = models.CharField(max_length=50)
+    name = models.CharField(max_length=50)
 
 class State(models.Model):
-	name = models.CharField(max_length=50)
-	country = models.ForeignKey(Country)
+    name = models.CharField(max_length=50)
+    country = models.ForeignKey(Country)
 
-	def __unicode__(self):
-		return self.name
+    def __unicode__(self):
+        return self.name
 
 class StateProxy(State):
-	class Meta:
-		proxy = True
+    class Meta:
+        proxy = True
 
 # Proxy models still works with filters (on related fields)
 # and select_related, even when mixed with model inheritance