diff --git a/erp5/util/testsuite/__init__.py b/erp5/util/testsuite/__init__.py
index 545da18a3a9acc0712a774b8356cc060d33b338c..b477ab26fbb0e2a326ff95f2e6d3fde7b51bc00a 100644
--- a/erp5/util/testsuite/__init__.py
+++ b/erp5/util/testsuite/__init__.py
@@ -1,6 +1,10 @@
-import re, sys, threading, os, subprocess
+import argparse
+import re, os, shlex, glob
+import sys, threading, subprocess
 import traceback
 import errno
+
+from erp5.util import taskdistribution
 from pprint import pprint
 
 _format_command_search = re.compile("[[\\s $({?*\\`#~';<>&|]").search
@@ -212,15 +216,6 @@ class TestSuite(object):
 # (XXX) The code bellow is an generic extension to run a test for any egg. 
 #       The code above was moved from ERP5 code base, because it is generic
 #       Enough to be used by others.
-# (FIXME) Imports should be reorganised in a better way
-import argparse
-import sys
-import glob
-import re
-import os
-import shlex
-from erp5.util import taskdistribution
-import re, os, shlex, glob
 
 class EggTestSuite(TestSuite):