diff --git a/builder/mergerepos b/builder/mergerepos
index 1e95f567..a27c1ee9 100755
--- a/builder/mergerepos
+++ b/builder/mergerepos
@@ -21,6 +21,7 @@
 # Largely borrowed from the mergerepo script included in createrepo and
 # written by Seth Vidal
 
+from __future__ import absolute_import
 import createrepo
 import os.path
 import rpmUtils.miscutils
diff --git a/koji/db.py b/koji/db.py
index 9e921912..c4e9ab33 100644
--- a/koji/db.py
+++ b/koji/db.py
@@ -21,6 +21,7 @@
 #       Mike McLean <mikem@redhat.com>
 
 
+from __future__ import absolute_import
 import logging
 import sys
 import psycopg2
@@ -33,7 +34,7 @@ import psycopg2
 # del psycopg2.extensions.string_types[1266]
 import time
 import traceback
-import context
+from . import context
 import re
 
 POSITIONAL_RE = re.compile(r'%[a-z]')
diff --git a/koji/server.py b/koji/server.py
index 6a6ae6a5..47ebacf2 100644
--- a/koji/server.py
+++ b/koji/server.py
@@ -19,6 +19,7 @@
 # Authors:
 #       Mike McLean <mikem@redhat.com>
 
+from __future__ import absolute_import
 import sys
 import traceback
 from koji.util import LazyDict
diff --git a/koji/ssl/SSLCommon.py b/koji/ssl/SSLCommon.py
index cbecedf0..0cff1eec 100644
--- a/koji/ssl/SSLCommon.py
+++ b/koji/ssl/SSLCommon.py
@@ -14,9 +14,10 @@
 #
 # Copyright 2005 Dan Williams <dcbw@redhat.com> and Red Hat, Inc.
 
+from __future__ import absolute_import
 import os, sys
 from OpenSSL import SSL
-import SSLConnection
+from . import SSLConnection
 import six.moves.http_client
 import socket
 
diff --git a/koji/ssl/SSLConnection.py b/koji/ssl/SSLConnection.py
index 2e53db7d..92de572c 100644
--- a/koji/ssl/SSLConnection.py
+++ b/koji/ssl/SSLConnection.py
@@ -6,6 +6,7 @@
 # Modifications by Dan Williams <dcbw@redhat.com>
 
 
+from __future__ import absolute_import
 from OpenSSL import SSL
 import time, socket, select
 
diff --git a/koji/ssl/__init__.py b/koji/ssl/__init__.py
index 7b4c2b36..fb2e3c75 100644
--- a/koji/ssl/__init__.py
+++ b/koji/ssl/__init__.py
@@ -1,6 +1,7 @@
 # identify this as the ssl module
 
 # our own ssl submodule masks python's in the main lib, so we import this here
+from __future__ import absolute_import
 try:
     import ssl      # python's ssl module
 except ImportError:  # pragma: no cover
diff --git a/plugins/builder/runroot.py b/plugins/builder/runroot.py
index f902659c..7856ce88 100644
--- a/plugins/builder/runroot.py
+++ b/plugins/builder/runroot.py
@@ -1,5 +1,6 @@
 # kojid plugin
 
+from __future__ import absolute_import
 import commands
 import koji
 import six.moves.configparser
diff --git a/plugins/builder/save_failed_tree.py b/plugins/builder/save_failed_tree.py
index b0f5cfd6..7c579a7e 100644
--- a/plugins/builder/save_failed_tree.py
+++ b/plugins/builder/save_failed_tree.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import fnmatch
 import os
 import sys
diff --git a/plugins/hub/echo.py b/plugins/hub/echo.py
index 38c96baf..739dfebf 100644
--- a/plugins/hub/echo.py
+++ b/plugins/hub/echo.py
@@ -5,6 +5,7 @@
 # Authors:
 #     Mike Bonnet <mikeb@redhat.com>
 
+from __future__ import absolute_import
 from koji.plugin import callbacks, callback, ignore_error
 import logging
 
diff --git a/plugins/hub/messagebus.py b/plugins/hub/messagebus.py
index 5bb2b01b..4841624a 100644
--- a/plugins/hub/messagebus.py
+++ b/plugins/hub/messagebus.py
@@ -4,6 +4,7 @@
 # Authors:
 #     Mike Bonnet <mikeb@redhat.com>
 
+from __future__ import absolute_import
 from koji import PluginError
 from koji.plugin import callbacks, callback, ignore_error
 import six.moves.configparser
diff --git a/plugins/hub/protonmsg.py b/plugins/hub/protonmsg.py
index 0a65c4e6..91e7e66f 100644
--- a/plugins/hub/protonmsg.py
+++ b/plugins/hub/protonmsg.py
@@ -5,6 +5,7 @@
 # Authors:
 #     Mike Bonnet <mikeb@redhat.com>
 
+from __future__ import absolute_import
 import koji
 from koji.plugin import callback, ignore_error
 from koji.context import context
diff --git a/plugins/hub/rpm2maven.py b/plugins/hub/rpm2maven.py
index ddf1a9fb..e918013c 100644
--- a/plugins/hub/rpm2maven.py
+++ b/plugins/hub/rpm2maven.py
@@ -5,6 +5,7 @@
 # Authors:
 #     Mike Bonnet <mikeb@redhat.com>
 
+from __future__ import absolute_import
 import koji
 from koji.context import context
 from koji.plugin import callback
diff --git a/plugins/hub/runroot_hub.py b/plugins/hub/runroot_hub.py
index e6ee0b35..708aede7 100644
--- a/plugins/hub/runroot_hub.py
+++ b/plugins/hub/runroot_hub.py
@@ -3,6 +3,7 @@
 # plugin has a config file.  This hub plugin has no config file.
 
 
+from __future__ import absolute_import
 from koji.context import context
 from koji.plugin import export
 import koji
diff --git a/plugins/hub/save_failed_tree.py b/plugins/hub/save_failed_tree.py
index 70caa262..70a796fc 100644
--- a/plugins/hub/save_failed_tree.py
+++ b/plugins/hub/save_failed_tree.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import sys
 import six.moves.configparser
 import koji
diff --git a/tests/test_builder/loadkojid.py b/tests/test_builder/loadkojid.py
index 7ff87802..d4e26e5f 100644
--- a/tests/test_builder/loadkojid.py
+++ b/tests/test_builder/loadkojid.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import os
 import sys
 
diff --git a/tests/test_cli/loadcli.py b/tests/test_cli/loadcli.py
index f9449fc3..703aeaa4 100644
--- a/tests/test_cli/loadcli.py
+++ b/tests/test_cli/loadcli.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import os
 import sys
 
diff --git a/tests/test_cli/test_add_group.py b/tests/test_cli/test_add_group.py
index 929d42af..f2d4aed7 100644
--- a/tests/test_cli/test_add_group.py
+++ b/tests/test_cli/test_add_group.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 
 import StringIO as stringio
@@ -8,7 +9,7 @@ import sys
 
 import mock
 
-import loadcli
+from . import loadcli
 
 cli = loadcli.cli
 
diff --git a/tests/test_cli/test_add_host.py b/tests/test_cli/test_add_host.py
index 552bcf35..a7ecf7db 100644
--- a/tests/test_cli/test_add_host.py
+++ b/tests/test_cli/test_add_host.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 
 import StringIO as stringio
@@ -8,7 +9,7 @@ import sys
 
 import mock
 
-import loadcli
+from . import loadcli
 
 cli = loadcli.cli
 
diff --git a/tests/test_cli/test_add_host_to_channel.py b/tests/test_cli/test_add_host_to_channel.py
index 4324c069..71978365 100644
--- a/tests/test_cli/test_add_host_to_channel.py
+++ b/tests/test_cli/test_add_host_to_channel.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 
 import StringIO as stringio
@@ -8,7 +9,7 @@ import sys
 
 import mock
 
-import loadcli
+from . import loadcli
 
 cli = loadcli.cli
 
diff --git a/tests/test_cli/test_add_pkg.py b/tests/test_cli/test_add_pkg.py
index 94483b06..909e1fdf 100644
--- a/tests/test_cli/test_add_pkg.py
+++ b/tests/test_cli/test_add_pkg.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 
 
@@ -11,7 +12,7 @@ import mock
 
 from mock import call
 
-import loadcli
+from . import loadcli
 
 cli = loadcli.cli
 
diff --git a/tests/test_cli/test_block_pkg.py b/tests/test_cli/test_block_pkg.py
index f493c326..f5219091 100644
--- a/tests/test_cli/test_block_pkg.py
+++ b/tests/test_cli/test_block_pkg.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 
 
@@ -11,7 +12,7 @@ import mock
 
 from mock import call
 
-import loadcli
+from . import loadcli
 
 cli = loadcli.cli
 
diff --git a/tests/test_cli/test_build.py b/tests/test_cli/test_build.py
index 1afe54e5..306df0b7 100644
--- a/tests/test_cli/test_build.py
+++ b/tests/test_cli/test_build.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 
 import StringIO as stringio
@@ -8,7 +9,7 @@ import sys
 
 import mock
 
-import loadcli
+from . import loadcli
 
 cli = loadcli.cli
 
diff --git a/tests/test_cli/test_chain_build.py b/tests/test_cli/test_chain_build.py
index 55699ca3..61449f76 100644
--- a/tests/test_cli/test_chain_build.py
+++ b/tests/test_cli/test_chain_build.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 
 import StringIO as stringio
@@ -8,7 +9,7 @@ import sys
 
 import mock
 
-import loadcli
+from . import loadcli
 
 cli = loadcli.cli
 
diff --git a/tests/test_cli/test_edit_host.py b/tests/test_cli/test_edit_host.py
index 0680fe65..bb86d117 100644
--- a/tests/test_cli/test_edit_host.py
+++ b/tests/test_cli/test_edit_host.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 
 import StringIO as stringio
@@ -10,7 +11,7 @@ import mock
 
 from mock import call
 
-import loadcli
+from . import loadcli
 
 cli = loadcli.cli
 
diff --git a/tests/test_cli/test_import_comps.py b/tests/test_cli/test_import_comps.py
index 5b17a903..5d01f55e 100644
--- a/tests/test_cli/test_import_comps.py
+++ b/tests/test_cli/test_import_comps.py
@@ -1,10 +1,11 @@
+from __future__ import absolute_import
 import json
 import unittest
 import StringIO as stringio
 import os
 import sys
 import mock
-import loadcli
+from . import loadcli
 
 try:
     import libcomps
diff --git a/tests/test_cli/test_list_commands.py b/tests/test_cli/test_list_commands.py
index afc9a144..b7779eb6 100644
--- a/tests/test_cli/test_list_commands.py
+++ b/tests/test_cli/test_list_commands.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import os
 import sys
 import unittest
@@ -6,7 +7,7 @@ import StringIO as stringio
 
 import mock
 
-import loadcli
+from . import loadcli
 cli = loadcli.cli
 
 
diff --git a/tests/test_cli/test_maven_build.py b/tests/test_cli/test_maven_build.py
index 53f77370..3b8b1870 100644
--- a/tests/test_cli/test_maven_build.py
+++ b/tests/test_cli/test_maven_build.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 
 import StringIO as stringio
@@ -8,7 +9,7 @@ import sys
 
 import mock
 
-import loadcli
+from . import loadcli
 import optparse
 
 cli = loadcli.cli
diff --git a/tests/test_cli/test_remove_channel.py b/tests/test_cli/test_remove_channel.py
index b76691aa..f881c558 100644
--- a/tests/test_cli/test_remove_channel.py
+++ b/tests/test_cli/test_remove_channel.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 
 import StringIO as stringio
@@ -8,7 +9,7 @@ import sys
 
 import mock
 
-import loadcli
+from . import loadcli
 
 cli = loadcli.cli
 
diff --git a/tests/test_cli/test_remove_host_from_channel.py b/tests/test_cli/test_remove_host_from_channel.py
index 490edf49..4a562827 100644
--- a/tests/test_cli/test_remove_host_from_channel.py
+++ b/tests/test_cli/test_remove_host_from_channel.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 
 import StringIO as stringio
@@ -8,7 +9,7 @@ import sys
 
 import mock
 
-import loadcli
+from . import loadcli
 
 cli = loadcli.cli
 
diff --git a/tests/test_cli/test_remove_pkg.py b/tests/test_cli/test_remove_pkg.py
index 9926158c..cad99a06 100644
--- a/tests/test_cli/test_remove_pkg.py
+++ b/tests/test_cli/test_remove_pkg.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 
 
@@ -11,7 +12,7 @@ import mock
 
 from mock import call
 
-import loadcli
+from . import loadcli
 
 cli = loadcli.cli
 
diff --git a/tests/test_cli/test_rename_channel.py b/tests/test_cli/test_rename_channel.py
index fb64c011..eca5a087 100644
--- a/tests/test_cli/test_rename_channel.py
+++ b/tests/test_cli/test_rename_channel.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 
 import StringIO as stringio
@@ -8,7 +9,7 @@ import sys
 
 import mock
 
-import loadcli
+from . import loadcli
 
 cli = loadcli.cli
 
diff --git a/tests/test_cli/test_running_in_bg.py b/tests/test_cli/test_running_in_bg.py
index db5bc3f4..64d21d4e 100644
--- a/tests/test_cli/test_running_in_bg.py
+++ b/tests/test_cli/test_running_in_bg.py
@@ -1,8 +1,9 @@
+from __future__ import absolute_import
 import unittest
 
 import mock
 
-import loadcli
+from . import loadcli
 
 cli = loadcli.cli
 
diff --git a/tests/test_cli/test_runroot.py b/tests/test_cli/test_runroot.py
index 4823bf31..b056105a 100644
--- a/tests/test_cli/test_runroot.py
+++ b/tests/test_cli/test_runroot.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import os
 import sys
 import unittest
@@ -7,7 +8,7 @@ import StringIO as stringio
 
 import mock
 
-import loadcli
+from . import loadcli
 cli = loadcli.cli
 
 
diff --git a/tests/test_cli/test_save_failed_tree.py b/tests/test_cli/test_save_failed_tree.py
index b8acf123..6b1dcfee 100644
--- a/tests/test_cli/test_save_failed_tree.py
+++ b/tests/test_cli/test_save_failed_tree.py
@@ -1,9 +1,10 @@
+from __future__ import absolute_import
 import StringIO
 import unittest
 import koji
 import mock
 
-import loadcli
+from . import loadcli
 cli = loadcli.cli
 
 
diff --git a/tests/test_cli/test_upload_progress_callback.py b/tests/test_cli/test_upload_progress_callback.py
index f330dd78..aa1a8f2b 100644
--- a/tests/test_cli/test_upload_progress_callback.py
+++ b/tests/test_cli/test_upload_progress_callback.py
@@ -1,9 +1,10 @@
+from __future__ import absolute_import
 import unittest
 import mock
 import sys
 import StringIO as stringio
 
-import loadcli
+from . import loadcli
 
 cli = loadcli.cli
 
diff --git a/tests/test_client_session.py b/tests/test_client_session.py
index 46ba9eac..2506f09a 100644
--- a/tests/test_client_session.py
+++ b/tests/test_client_session.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 import unittest
 
diff --git a/tests/test_compatrequests.py b/tests/test_compatrequests.py
index 6a684ef7..250cc3dc 100644
--- a/tests/test_compatrequests.py
+++ b/tests/test_compatrequests.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import six.moves.http_client
 import mock
 import unittest
diff --git a/tests/test_fixEncoding.py b/tests/test_fixEncoding.py
index 4af66e9c..ee8e0895 100644
--- a/tests/test_fixEncoding.py
+++ b/tests/test_fixEncoding.py
@@ -3,6 +3,7 @@
 
 """Test the __init__.py module"""
 
+from __future__ import absolute_import
 import koji
 import unittest
 
diff --git a/tests/test_hub/test_add_btype.py b/tests/test_hub/test_add_btype.py
index e64cc0f0..6a73b0dc 100644
--- a/tests/test_hub/test_add_btype.py
+++ b/tests/test_hub/test_add_btype.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 import mock
 
diff --git a/tests/test_hub/test_apply_query_opts.py b/tests/test_hub/test_apply_query_opts.py
index 653723c8..6d23d6ad 100644
--- a/tests/test_hub/test_apply_query_opts.py
+++ b/tests/test_hub/test_apply_query_opts.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import copy
 import unittest
 
diff --git a/tests/test_hub/test_cg_importer.py b/tests/test_hub/test_cg_importer.py
index f77ce67f..f891610a 100644
--- a/tests/test_hub/test_cg_importer.py
+++ b/tests/test_hub/test_cg_importer.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 import mock
 import os
diff --git a/tests/test_hub/test_create_tag.py b/tests/test_hub/test_create_tag.py
index 91dea252..46356586 100644
--- a/tests/test_hub/test_create_tag.py
+++ b/tests/test_hub/test_create_tag.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import copy
 import mock
 import shutil
diff --git a/tests/test_hub/test_delete_build.py b/tests/test_hub/test_delete_build.py
index 2cd2dae7..91e497fb 100644
--- a/tests/test_hub/test_delete_build.py
+++ b/tests/test_hub/test_delete_build.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 import unittest
 import kojihub
diff --git a/tests/test_hub/test_dist_repo.py b/tests/test_hub/test_dist_repo.py
index 33f1b6c4..50b6057b 100644
--- a/tests/test_hub/test_dist_repo.py
+++ b/tests/test_hub/test_dist_repo.py
@@ -1,4 +1,5 @@
 
+from __future__ import absolute_import
 import unittest
 import mock
 import os
diff --git a/tests/test_hub/test_edit_tag.py b/tests/test_hub/test_edit_tag.py
index 65d6dc62..0c57e752 100644
--- a/tests/test_hub/test_edit_tag.py
+++ b/tests/test_hub/test_edit_tag.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 import unittest
 
diff --git a/tests/test_hub/test_getRPMDeps.py b/tests/test_hub/test_getRPMDeps.py
index 0d3149eb..6bfcfcc2 100644
--- a/tests/test_hub/test_getRPMDeps.py
+++ b/tests/test_hub/test_getRPMDeps.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 import os
 import unittest
diff --git a/tests/test_hub/test_get_build_type.py b/tests/test_hub/test_get_build_type.py
index b4013e96..e4a08628 100644
--- a/tests/test_hub/test_get_build_type.py
+++ b/tests/test_hub/test_get_build_type.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 import mock
 
diff --git a/tests/test_hub/test_get_next_release.py b/tests/test_hub/test_get_next_release.py
index adfeea37..92a3e14c 100644
--- a/tests/test_hub/test_get_next_release.py
+++ b/tests/test_hub/test_get_next_release.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 import unittest
 
diff --git a/tests/test_hub/test_get_upload_path.py b/tests/test_hub/test_get_upload_path.py
index a1191cea..d11e1b14 100644
--- a/tests/test_hub/test_get_upload_path.py
+++ b/tests/test_hub/test_get_upload_path.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import os
 import mock
 import shutil
diff --git a/tests/test_hub/test_get_verify_class.py b/tests/test_hub/test_get_verify_class.py
index ae94ed68..57809e8f 100644
--- a/tests/test_hub/test_get_verify_class.py
+++ b/tests/test_hub/test_get_verify_class.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 import kojihub
 from koji import GenericError
diff --git a/tests/test_hub/test_import_build.py b/tests/test_hub/test_import_build.py
index 108f9112..7abea630 100644
--- a/tests/test_hub/test_import_build.py
+++ b/tests/test_hub/test_import_build.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import copy
 import mock
 import shutil
diff --git a/tests/test_hub/test_import_image_internal.py b/tests/test_hub/test_import_image_internal.py
index b23f7282..9dcb3d32 100644
--- a/tests/test_hub/test_import_image_internal.py
+++ b/tests/test_hub/test_import_image_internal.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 import mock
 import os
diff --git a/tests/test_hub/test_insert_processor.py b/tests/test_hub/test_insert_processor.py
index 1771681c..fde1cc31 100644
--- a/tests/test_hub/test_insert_processor.py
+++ b/tests/test_hub/test_insert_processor.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 import mock
 
diff --git a/tests/test_hub/test_list_btypes.py b/tests/test_hub/test_list_btypes.py
index b5f4bc55..6649e894 100644
--- a/tests/test_hub/test_list_btypes.py
+++ b/tests/test_hub/test_list_btypes.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 import mock
 
diff --git a/tests/test_hub/test_list_task_output.py b/tests/test_hub/test_list_task_output.py
index 0b27af1a..6a5f15ce 100644
--- a/tests/test_hub/test_list_task_output.py
+++ b/tests/test_hub/test_list_task_output.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 import mock
 
diff --git a/tests/test_hub/test_listing.py b/tests/test_hub/test_listing.py
index a39f2b05..16479340 100644
--- a/tests/test_hub/test_listing.py
+++ b/tests/test_hub/test_listing.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 import mock
 
diff --git a/tests/test_hub/test_models/test_host.py b/tests/test_hub/test_models/test_host.py
index c1bc6e5b..80f66670 100644
--- a/tests/test_hub/test_models/test_host.py
+++ b/tests/test_hub/test_models/test_host.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 import mock
 
diff --git a/tests/test_hub/test_new_typed_build.py b/tests/test_hub/test_new_typed_build.py
index a1ae47f7..b7b6ccf4 100644
--- a/tests/test_hub/test_new_typed_build.py
+++ b/tests/test_hub/test_new_typed_build.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 import mock
 
diff --git a/tests/test_hub/test_query_processor.py b/tests/test_hub/test_query_processor.py
index 7b229bde..e7c7cb85 100644
--- a/tests/test_hub/test_query_processor.py
+++ b/tests/test_hub/test_query_processor.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 import mock
 
diff --git a/tests/test_hub/test_recycle_build.py b/tests/test_hub/test_recycle_build.py
index 2179b044..5de0d70c 100644
--- a/tests/test_hub/test_recycle_build.py
+++ b/tests/test_hub/test_recycle_build.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 
 import koji
diff --git a/tests/test_hub/test_rpmdiff.py b/tests/test_hub/test_rpmdiff.py
index 277902fb..4f94f38d 100644
--- a/tests/test_hub/test_rpmdiff.py
+++ b/tests/test_hub/test_rpmdiff.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import copy
 import unittest
 import mock
diff --git a/tests/test_hub/test_tag_operations.py b/tests/test_hub/test_tag_operations.py
index 2f0d10c1..1b05efb7 100644
--- a/tests/test_hub/test_tag_operations.py
+++ b/tests/test_hub/test_tag_operations.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import copy
 import mock
 import shutil
diff --git a/tests/test_hub/test_update_processor.py b/tests/test_hub/test_update_processor.py
index e765b3b0..b31956a2 100644
--- a/tests/test_hub/test_update_processor.py
+++ b/tests/test_hub/test_update_processor.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 import mock
 
diff --git a/tests/test_krbv.py b/tests/test_krbv.py
index 0fea6794..f96b525b 100644
--- a/tests/test_krbv.py
+++ b/tests/test_krbv.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 
 # This is python-mock, not the rpm mock tool we know and love
diff --git a/tests/test_parsers.py b/tests/test_parsers.py
index 5587ec3e..02ff1c2c 100644
--- a/tests/test_parsers.py
+++ b/tests/test_parsers.py
@@ -2,6 +2,7 @@
 
 """Test the __init__.py module"""
 
+from __future__ import absolute_import
 import mock
 import os
 import rpm
diff --git a/tests/test_plugins/test_protonmsg.py b/tests/test_plugins/test_protonmsg.py
index 108be2e9..442be5ff 100644
--- a/tests/test_plugins/test_protonmsg.py
+++ b/tests/test_plugins/test_protonmsg.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 from mock import patch, MagicMock
 import protonmsg
diff --git a/tests/test_plugins/test_runroot_builder.py b/tests/test_plugins/test_runroot_builder.py
index 910c7832..d82e7104 100644
--- a/tests/test_plugins/test_runroot_builder.py
+++ b/tests/test_plugins/test_runroot_builder.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 import mock
 import six.moves.configparser
diff --git a/tests/test_plugins/test_runroot_hub.py b/tests/test_plugins/test_runroot_hub.py
index 79b5696b..4f129c88 100644
--- a/tests/test_plugins/test_runroot_hub.py
+++ b/tests/test_plugins/test_runroot_hub.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 import mock
 
diff --git a/tests/test_plugins/test_save_failed_tree_builder.py b/tests/test_plugins/test_save_failed_tree_builder.py
index 56c92a53..920f6059 100644
--- a/tests/test_plugins/test_save_failed_tree_builder.py
+++ b/tests/test_plugins/test_save_failed_tree_builder.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 import os
 import sys
diff --git a/tests/test_policy.py b/tests/test_policy.py
index 2fbc0aaf..d228df77 100644
--- a/tests/test_policy.py
+++ b/tests/test_policy.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import unittest
 
 from nose.tools import raises
diff --git a/tests/test_utils.py b/tests/test_utils.py
index ac533c1f..1c588361 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -1,3 +1,4 @@
+from __future__ import absolute_import
 import mock
 import unittest
 from mock import call