Merge "Allow users to run 'tox -epy34'"
diff --git a/neutron/tests/tempest/common/glance_http.py b/neutron/tests/tempest/common/glance_http.py
index 66fc2ab..6650477 100644
--- a/neutron/tests/tempest/common/glance_http.py
+++ b/neutron/tests/tempest/common/glance_http.py
@@ -17,7 +17,7 @@
import copy
import hashlib
-import httplib
+from six.moves import http_client as httplib
import json
import posixpath
import re
diff --git a/neutron/tests/tempest/services/botoclients.py b/neutron/tests/tempest/services/botoclients.py
index 025e8e1..87d5266 100644
--- a/neutron/tests/tempest/services/botoclients.py
+++ b/neutron/tests/tempest/services/botoclients.py
@@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-import ConfigParser
+from six.moves import configparser as ConfigParser
import contextlib
from tempest_lib import exceptions as lib_exc
import types