diff --git a/v2/test/__init__.py b/v2/test/__init__.py
index e69de29bb2d..e7489db6fba 100644
--- a/v2/test/__init__.py
+++ b/v2/test/__init__.py
@@ -0,0 +1,5 @@
+
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
diff --git a/v2/test/compat.py b/v2/test/compat.py
index 9fe93b7763e..6930de94b0c 100644
--- a/v2/test/compat.py
+++ b/v2/test/compat.py
@@ -15,6 +15,10 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 import sys
 import unittest
 
diff --git a/v2/test/errors/__init__.py b/v2/test/errors/__init__.py
index 674334b15a3..20207b272d0 100644
--- a/v2/test/errors/__init__.py
+++ b/v2/test/errors/__init__.py
@@ -15,4 +15,8 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 
diff --git a/v2/test/errors/test_errors.py b/v2/test/errors/test_errors.py
index f67af449dc6..42174ae08c3 100644
--- a/v2/test/errors/test_errors.py
+++ b/v2/test/errors/test_errors.py
@@ -15,6 +15,10 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 from .. compat import unittest
 
 from ansible.parsing.yaml.objects import AnsibleBaseYAMLObject
diff --git a/v2/test/parsing/__init__.py b/v2/test/parsing/__init__.py
index 1f84012e014..785fc459921 100644
--- a/v2/test/parsing/__init__.py
+++ b/v2/test/parsing/__init__.py
@@ -14,3 +14,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
diff --git a/v2/test/parsing/test_general.py b/v2/test/parsing/test_general.py
index d003f15d2bd..0a150e1a233 100644
--- a/v2/test/parsing/test_general.py
+++ b/v2/test/parsing/test_general.py
@@ -15,6 +15,10 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 from .. compat import unittest
 from ansible.parsing import load
 from ansible.errors import AnsibleParserError
diff --git a/v2/test/parsing/test_mod_args.py b/v2/test/parsing/test_mod_args.py
index 4c7d5b5f9e9..e593522aa82 100644
--- a/v2/test/parsing/test_mod_args.py
+++ b/v2/test/parsing/test_mod_args.py
@@ -15,6 +15,10 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 from ansible.parsing.mod_args import ModuleArgsParser
 
 from .. compat import unittest
diff --git a/v2/test/parsing/yaml/__init__.py b/v2/test/parsing/yaml/__init__.py
index 1f84012e014..785fc459921 100644
--- a/v2/test/parsing/yaml/__init__.py
+++ b/v2/test/parsing/yaml/__init__.py
@@ -14,3 +14,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
diff --git a/v2/test/parsing/yaml/test_yaml.py b/v2/test/parsing/yaml/test_yaml.py
index 61859b0d168..6b1d09d741d 100644
--- a/v2/test/parsing/yaml/test_yaml.py
+++ b/v2/test/parsing/yaml/test_yaml.py
@@ -15,6 +15,10 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 from ... compat import unittest
 
 from yaml.scanner import ScannerError
diff --git a/v2/test/playbook/__init__.py b/v2/test/playbook/__init__.py
index 1f84012e014..785fc459921 100644
--- a/v2/test/playbook/__init__.py
+++ b/v2/test/playbook/__init__.py
@@ -14,3 +14,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
diff --git a/v2/test/playbook/test_task.py b/v2/test/playbook/test_task.py
index 286437b4d4f..487bca207b0 100644
--- a/v2/test/playbook/test_task.py
+++ b/v2/test/playbook/test_task.py
@@ -15,6 +15,10 @@
 # You should have received a copy of the GNU General Public License
 # along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
 
+# Make coding more python3-ish
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
 from ansible.playbook.task import Task
 from .. compat import unittest