Index: lnt/lnttool/admin.py
===================================================================
--- lnt/lnttool/admin.py
+++ lnt/lnttool/admin.py
@@ -13,7 +13,7 @@
     requests = import_module('requests')
     json = import_module('json')
     os = import_module('os')
-    http = import_module('http.client')
+    http = import_module('http')
 
 
 def _error(msg):
Index: tests/lnttool/admin.shtest
===================================================================
--- tests/lnttool/admin.shtest
+++ tests/lnttool/admin.shtest
@@ -92,6 +92,11 @@
 # RM_MACHINE: Deleting runs 1 2 (2/2)
 # RM_MACHINE: Deleted machine localhost__clang_DEV__x86_64:1
 
+! lnt admin rm-machine 42 2> rm_machine2.stderr
+# RUN: FileCheck %s --check-prefix=RM_MACHINE2 < %t.tmp/rm_machine2.stderr
+# RM_MACHINE2: 404: Not Found
+# RM_MACHINE2: Did not find machine '42'
+
 lnt admin list-machines > list_machines2.stdout
 # RUN: FileCheck %s --check-prefix=LIST_MACHINES2 < %t.tmp/list_machines2.stdout
 # LIST_MACHINES2-NOT: localhost__clang_DEV__x86_64:1