=== modified file 'cloudinit/cmd/main.py'
--- cloudinit/cmd/main.py	2016-06-14 22:00:40 +0000
+++ cloudinit/cmd/main.py	2016-06-15 18:13:14 +0000
@@ -30,7 +30,6 @@
 import traceback
 
 from cloudinit import patcher
-patcher.patch()
 
 from cloudinit import log as logging
 from cloudinit import netinfo
@@ -47,6 +46,7 @@
 from cloudinit.settings import (PER_INSTANCE, PER_ALWAYS, PER_ONCE,
                                 CLOUD_CONFIG)
 
+patcher.patch()
 
 # Pretty little cheetah formatted welcome message template
 WELCOME_MSG_TPL = ("Cloud-init v. ${version} running '${action}' at "

=== modified file 'tests/unittests/test_cli.py'
--- tests/unittests/test_cli.py	2016-06-14 21:56:51 +0000
+++ tests/unittests/test_cli.py	2016-06-15 18:18:29 +0000
@@ -1,11 +1,6 @@
-import imp
-import os
 import six
-import sys
 
 from . import helpers as test_helpers
-mock = test_helpers.mock
-
 from cloudinit.cmd import main as cli
 
 

=== modified file 'tools/run-pep8'
--- tools/run-pep8	2016-03-03 22:20:10 +0000
+++ tools/run-pep8	2016-06-15 18:11:40 +0000
@@ -1,8 +1,6 @@
 #!/bin/bash
 
-pycheck_dirs=( "cloudinit/" "bin/" "tests/" "tools/" )
-# FIXME: cloud-init modifies sys module path, pep8 does not like
-# bin_files=( "bin/cloud-init" )
+pycheck_dirs=( "cloudinit/" "tests/" "tools/" )
 CR="
 "
 [ "$1" = "-v" ] && { verbose="$1"; shift; } || verbose=""

=== modified file 'tools/run-pyflakes'
--- tools/run-pyflakes	2016-03-03 22:32:32 +0000
+++ tools/run-pyflakes	2016-06-15 18:18:41 +0000
@@ -3,7 +3,7 @@
 PYTHON_VERSION=${PYTHON_VERSION:-2}
 CR="
 "
-pycheck_dirs=( "cloudinit/" "bin/" "tests/" "tools/" )
+pycheck_dirs=( "cloudinit/" "tests/" "tools/" )
 
 set -f
 if [ $# -eq 0 ]; then