diff --git a/docker/utils/utils.py b/docker/utils/utils.py
index bde18b6b..8182a435 100644
--- a/docker/utils/utils.py
+++ b/docker/utils/utils.py
@@ -823,7 +823,7 @@ def split_command(command):
 
 def format_environment(environment):
     def format_env(key, value):
-        if not value:
+        if value is None:
             return key
         return '{key}={value}'.format(key=key, value=value)
     return [format_env(*var) for var in six.iteritems(environment)]
diff --git a/tests/integration/container_test.py b/tests/integration/container_test.py
index eb5b7467..91f06049 100644
--- a/tests/integration/container_test.py
+++ b/tests/integration/container_test.py
@@ -374,11 +374,14 @@ class CreateContainerTest(helpers.BaseTestCase):
         container = self.client.create_container(
             BUSYBOX,
             ['echo'],
-            environment={'Foo': None, 'Other': 'one'},
+            environment={'Foo': None, 'Other': 'one', 'Blank': ''},
         )
         self.tmp_containers.append(container['Id'])
         config = self.client.inspect_container(container['Id'])
-        assert sorted(config['Config']['Env']) == sorted(['Foo', 'Other=one'])
+        assert (
+            sorted(config['Config']['Env']) ==
+            sorted(['Foo', 'Other=one', 'Blank='])
+        )
 
 
 class VolumeBindTest(helpers.BaseTestCase):