diff --git a/public/config_test.py b/public/config_test.py
index 28cfbdb..694ed6b 100644
--- a/public/config_test.py
+++ b/public/config_test.py
@@ -21,8 +21,6 @@
 
 from unittest import mock
 
-import six
-
 # pylint: disable=no-name-in-module,import-error
 from acloud import errors
 from acloud.internal.proto import internal_config_pb2
@@ -152,7 +150,7 @@
         self.assertEqual(cfg.client_secret, "fake_client_secret")
         self.assertEqual(cfg.extra_args_ssh_tunnel, "fake_extra_args_ssh_tunnel")
         self.assertEqual(
-            dict(six.iteritems(cfg.metadata_variable)),
+            dict(cfg.metadata_variable.items()),
             {"metadata_1": "metadata_value_1"})
         self.assertEqual(cfg.hw_property,
                          "cpu:3,resolution:1080x1920,dpi:480,memory:4g,"
@@ -224,17 +222,17 @@
         self.assertEqual(cfg.default_usr_cfg.machine_type, "n1-standard-1")
         self.assertEqual(cfg.default_usr_cfg.network, "default")
         self.assertEqual(
-            dict(six.iteritems(cfg.default_usr_cfg.metadata_variable)),
+            dict(cfg.default_usr_cfg.metadata_variable.items()),
             {"metadata_1": "metadata_value_1",
             "metadata_2": "metadata_value_2"})
         self.assertEqual(
-            dict(six.iteritems(cfg.device_resolution_map)),
+            dict(cfg.device_resolution_map.items()),
             {"nexus5": "1080x1920x32x480"})
         self.assertEqual(
-            dict(six.iteritems(cfg.device_default_orientation_map)),
+            dict(cfg.device_default_orientation_map.items()),
             {"nexus5": "portrait"})
         self.assertEqual(
-            dict(six.iteritems(cfg.valid_branch_and_min_build_id)),
+            dict(cfg.valid_branch_and_min_build_id.items()),
             {"aosp-master": 0})
         self.assertEqual(cfg.default_usr_cfg.stable_host_image_name,
                          "fake_stable_host_image_name")
@@ -259,7 +257,7 @@
 
         # hw property
         self.assertEqual(
-            dict(six.iteritems(cfg.common_hw_property_map)),
+            dict(cfg.common_hw_property_map.items()),
             {"phone": "cpu:2,resolution:1080x1920,dpi:420,memory:4g,disk:8g",
              "auto": "cpu:4,resolution:1280x800,dpi:160,memory:4g"})