diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 2f3aab7ee438c2c5f0c4bc366c199f1af5935ca2..df275c389ecf54664d5d712352287e80c89b18ec 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -1339,7 +1339,7 @@ def _BuildNetworkHookEnv(name, subnet, gateway, network6, gateway6,
   @param tags: the tags of the network
 
   """
-  env = dict()
+  env = {}
   if name:
     env["NETWORK_NAME"] = name
   if subnet:
@@ -12841,7 +12841,7 @@ class LUInstanceSetParams(LogicalUnit):
     This runs on the master, primary and secondaries.
 
     """
-    args = dict()
+    args = {}
     if constants.BE_MINMEM in self.be_new:
       args["minmem"] = self.be_new[constants.BE_MINMEM]
     if constants.BE_MAXMEM in self.be_new:
@@ -16062,7 +16062,7 @@ class LUNetworkConnect(LogicalUnit):
           self.cfg.GetNodeGroupInstances(self.group_uuid)
 
   def BuildHooksEnv(self):
-    ret = dict()
+    ret = {}
     ret["GROUP_NAME"] = self.group_name
     ret["GROUP_NETWORK_MODE"] = self.network_mode
     ret["GROUP_NETWORK_LINK"] = self.network_link
@@ -16077,7 +16077,7 @@ class LUNetworkConnect(LogicalUnit):
     l = lambda value: ", ".join("%s: %s/%s" % (i[0], i[1], i[2])
                                    for i in value)
 
-    self.netparams = dict()
+    self.netparams = {}
     self.netparams[constants.NIC_MODE] = self.network_mode
     self.netparams[constants.NIC_LINK] = self.network_link
     objects.NIC.CheckParameterSyntax(self.netparams)
@@ -16158,7 +16158,7 @@ class LUNetworkDisconnect(LogicalUnit):
           self.cfg.GetNodeGroupInstances(self.group_uuid)
 
   def BuildHooksEnv(self):
-    ret = dict()
+    ret = {}
     ret["GROUP_NAME"] = self.group_name
     ret.update(_BuildNetworkHookEnvByObject(self.network))
     return ret
diff --git a/test/ganeti.utils.algo_unittest.py b/test/ganeti.utils.algo_unittest.py
index 5d08e2ea8ff1f59c80d4dffc6361423c8b218abb..73475ec38f197c548d0b15e532f90ff42849aad3 100755
--- a/test/ganeti.utils.algo_unittest.py
+++ b/test/ganeti.utils.algo_unittest.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 #
 
-# Copyright (C) 2011 Google Inc.
+# Copyright (C) 2011, 2012 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -286,7 +286,7 @@ class TestRunningTimeout(unittest.TestCase):
 class TestJoinDisjointDicts(unittest.TestCase):
   def setUp(self):
     self.non_empty_dict = {"a": 1, "b": 2}
-    self.empty_dict = dict()
+    self.empty_dict = {}
 
   def testWithEmptyDicts(self):
     self.assertEqual(self.empty_dict, algo.JoinDisjointDicts(self.empty_dict,