diff --git a/i18n/test/test_extract.py b/i18n/test/test_extract.py
index e0cbd912d0..ade6e57fa8 100644
--- a/i18n/test/test_extract.py
+++ b/i18n/test/test_extract.py
@@ -1,11 +1,13 @@
-import os
+import os, polib
 from unittest import TestCase
-from datetime import datetime
-import polib
+from datetime import datetime, timedelta
 
 import extract
 from execute import SOURCE_MSGS_DIR
 
+# Make sure setup runs only once
+SETUP_HAS_RUN = False
+
 class TestExtract(TestCase):
     """
     Tests functionality of i18n/extract.py
@@ -13,11 +15,21 @@ class TestExtract(TestCase):
     generated_files = ('django-partial.po', 'djangojs.po', 'mako.po')
 
     def setUp(self):
+        global SETUP_HAS_RUN
+        
         # Subtract 1 second to help comparisons with file-modify time succeed,
         # since os.path.getmtime() is not millisecond-accurate
         self.start_time = datetime.now() - timedelta(seconds=1)
+        super(TestExtract, self).setUp()
+        if not SETUP_HAS_RUN:
+            self.run_main()
+            SETUP_HAS_RUN = True
 
+    def run_main(self):
         # Run extraction script. Warning, this takes 1 minute or more
+        print "***********************"
+        print "***********************"
+        print "***********************"
         extract.main()
 
     def get_files (self):
diff --git a/i18n/test/test_generate.py b/i18n/test/test_generate.py
index 295fd646d4..fc22988251 100644
--- a/i18n/test/test_generate.py
+++ b/i18n/test/test_generate.py
@@ -1,11 +1,7 @@
-import os
-import string
-import polib
-import random
+import os, string, random
 from unittest import TestCase
 from datetime import datetime, timedelta
 
-
 import generate
 from execute import get_config, messages_dir, SOURCE_MSGS_DIR, SOURCE_LOCALE