diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 1eaed4c1ad9a7f1aad7678a322feb8eddb70735c..8b31fd6c4ec4b077d33e01a5813855de1f6c3fac 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -1476,6 +1476,8 @@ class LUQueryNodes(NoHooksLU):
           "Some nodes were removed before retrieving their data: %s" % missing)
     else:
       nodenames = all_info.keys()
+
+    nodenames = utils.NiceSort(nodenames)
     nodelist = [all_info[name] for name in nodenames]
 
     # begin data gathering
@@ -2664,6 +2666,8 @@ class LUQueryInstances(NoHooksLU):
           % missing)
     else:
       instance_names = all_info.keys()
+
+    instance_names = utils.NiceSort(instance_names)
     instance_list = [all_info[iname] for iname in instance_names]
 
     # begin data gathering