Merge ~d0ugal/maas:less-underscores-2.8 into maas:2.8

[Dougal Matthews]

Remove extra underscores from test method names
The normal convention in Python is to use test_ as a prefix to test
names. A number of tests in MAAS were prefixed with test__ or test___.
This change removes the superfluous underscores.

[Alberto Donato (ack)]

+1

review: Approve

diff --git a/src/maascli/tests/test_utils.py b/src/maascli/tests/test_utils.py
index f764598..4840f8b 100644
--- a/src/maascli/tests/test_utils.py
+++ b/src/maascli/tests/test_utils.py
@@ -217,7 +217,7 @@ class TestIsResponseTextual(MAASTestCase):
 class TestPrintResponseHeaders(MAASTestCase):
     """Tests for `print_response_headers`."""
 
-    def test__prints_http_headers_in_order(self):
+    def test_prints_http_headers_in_order(self):
         # print_response_headers() prints the given headers, in order, with
         # each hyphen-delimited part of the header name capitalised, to the
         # given file, with the names right aligned, and with a 2 space left
@@ -236,7 +236,7 @@ class TestPrintResponseHeaders(MAASTestCase):
 class TestPrintResponseContent(MAASTestCase):
     """Tests for `print_response_content`."""
 
-    def test__prints_textual_response_with_newline(self):
+    def test_prints_textual_response_with_newline(self):
         # If the response content is textual and sys.stdout is connected to a
         # TTY, print_response_content() prints the response with a trailing
         # newline.
@@ -252,7 +252,7 @@ class TestPrintResponseContent(MAASTestCase):
         utils.print_response_content(response, response["content"], buf)
         self.assertEqual(response["content"] + b"\n", buf.getvalue())
 
-    def test__prints_textual_response_when_redirected(self):
+    def test_prints_textual_response_when_redirected(self):
         # If the response content is textual and sys.stdout is not connected
         # to a TTY, print_response_content() prints the response without a
         # trailing newline.
@@ -267,7 +267,7 @@ class TestPrintResponseContent(MAASTestCase):
         utils.print_response_content(response, response["content"], buf)
         self.assertEqual(response["content"], buf.getvalue())
 
-    def test__writes_binary_response(self):
+    def test_writes_binary_response(self):
         # Non-textual response content is written to the output stream
         # using write(), so it carries no trailing newline, even if
         # stdout is connected to a tty
@@ -282,7 +282,7 @@ class TestPrintResponseContent(MAASTestCase):
         utils.print_response_content(response, response["content"], buf)
         self.assertEqual(response["content"], buf.getvalue())
 
-    def test__prints_textual_response_with_success_msg(self):
+    def test_prints_textual_response_with_success_msg(self):
         # When the response has a status code of 2XX, and the response body is
         # textual print_response_content() will print a success message to the
         # TTY.
diff --git a/src/maasserver/api/tests/test_discoveries.py b/src/maasserver/api/tests/test_discoveries.py
index 16176f2..a82fec7 100644
--- a/src/maasserver/api/tests/test_discoveries.py
+++ b/src/maasserver/api/tests/test_discoveries.py
@@ -115,7 +115,7 @@ class TestDiscoveriesAPI(APITestCase.ForUser):
         self.assertTrue(results[0]["last_seen"] >= results[1]["last_seen"])
         self.assertTrue(results[1]["last_seen"] >= results[2]["last_seen"])
 
-    def test__by_unknown_mac(self):
+    def test_by_unknown_mac(self):
         rack = factory.make_RackController()
         iface = factory.make_Interface(node=rack)
         discovery = factory.make_Discovery(interface=iface)
@@ -127,7 +127,7 @@ class TestDiscoveriesAPI(APITestCase.ForUser):
         results = self.get_api_results({"op": "by_unknown_mac"})
         self.assertThat(len(results), Equals(0))
 
-    def test__by_unknown_ip(self):
+    def test_by_unknown_ip(self):
         rack = factory.make_RackController()
         iface = factory.make_Interface(node=rack)
         discovery = factory.make_Discovery(interface=iface, ip="10.0.0.1")
@@ -139,7 +139,7 @@ class TestDiscoveriesAPI(APITestCase.ForUser):
         results = self.get_api_results({"op": "by_unknown_ip"})
         self.assertThat(len(results), Equals(0))
 
-    def test__by_unknown_ip_and_mac__known_ip(self):
+    def test_by_unknown_ip_and_mac__known_ip(self):
         rack = factory.make_RackController()
         iface = factory.make_Interface(node=rack)
         discovery = factory.make_Discovery(interface=iface, ip="10.0.0.1")
@@ -150,7 +150,7 @@ class TestDiscoveriesAPI(APITestCase.ForUser):
         results = self.get_api_results({"op": "by_unknown_ip_and_mac"})
         self.assertThat(len(results), Equals(0))
 
-    def test__by_unknown_ip_and_mac__known_mac(self):
+    def test_by_unknown_ip_and_mac__known_mac(self):
         rack = factory.make_RackController()
         iface = factory.make_Interface(node=rack)
         discovery = factory.make_Discovery(interface=iface)
@@ -187,15 +187,15 @@ class TestDiscoveriesScanAPI(APITestCase.ForUser):
         result = {"result": factory.make_name()}
         self.scan_all_rack_networks_mock.return_value = result
 
-    def test__scan__fails_scan_all_if_not_forced(self):
+    def test_scan__fails_scan_all_if_not_forced(self):
         response = self.post_api_response({"op": "scan"})
         self.assertThat(response, HasStatusCode(http.client.BAD_REQUEST))
 
-    def test__scan__threads_must_be_number(self):
+    def test_scan__threads_must_be_number(self):
         response = self.post_api_response({"op": "scan", "threads": "x"})
         self.assertThat(response, HasStatusCode(http.client.BAD_REQUEST))
 
-    def test__scan__calls_scan_all_networks_with_scan_all_if_forced(self):
+    def test_scan__calls_scan_all_networks_with_scan_all_if_forced(self):
         result = self.post_api_results({"op": "scan", "force": "true"})
         self.assertThat(result, Equals(result))
         self.assertThat(
@@ -205,7 +205,7 @@ class TestDiscoveriesScanAPI(APITestCase.ForUser):
             ),
         )
 
-    def test__scan__passes_ping(self):
+    def test_scan__passes_ping(self):
         result = self.post_api_results(
             {"op": "scan", "force": "true", "always_use_ping": "true"}
         )
@@ -217,7 +217,7 @@ class TestDiscoveriesScanAPI(APITestCase.ForUser):
             ),
         )
 
-    def test__scan__passes_slow(self):
+    def test_scan__passes_slow(self):
         result = self.post_api_results(
             {"op": "scan", "force": "true", "slow": "true"}
         )
@@ -229,7 +229,7 @@ class TestDiscoveriesScanAPI(APITestCase.ForUser):
             ),
         )
 
-    def test__scan__passes_threads(self):
+    def test_scan__passes_threads(self):
         result = self.post_api_results(
             {"op": "scan", "force": "true", "threads": "3.14"}
         )
@@ -241,7 +241,7 @@ class TestDiscoveriesScanAPI(APITestCase.ForUser):
             ),
         )
 
-    def test__scan__calls_scan_all_networks_with_specified_cidrs(self):
+    def test_scan__calls_scan_all_networks_with_specified_cidrs(self):
         result = self.post_api_results(
             {
                 "op": "scan",
@@ -263,17 +263,17 @@ class TestDiscoveriesScanAPI(APITestCase.ForUser):
             ),
         )
 
-    def test__scan__with_invalid_cidrs_fails(self):
+    def test_scan__with_invalid_cidrs_fails(self):
         response = self.post_api_response(
             {"op": "scan", "cidr": ["x.x.x.x/y"]}
         )
         self.assertThat(response, HasStatusCode(http.client.BAD_REQUEST))
 
-    def test__scan__with_no_cidrs_does_not_call_scan_all_networks(self):
+    def test_scan__with_no_cidrs_does_not_call_scan_all_networks(self):
         response = self.post_api_response({"op": "scan"})
         self.assertThat(response, HasStatusCode(http.client.BAD_REQUEST))
 
-    def test__clear_not_allowed_for_non_admin(self):
+    def test_clear_not_allowed_for_non_admin(self):
         rack = factory.make_RackController()
         iface = rack.interface_set.first()
         make_discoveries(interface=iface, count=3)
@@ -283,7 +283,7 @@ class TestDiscoveriesScanAPI(APITestCase.ForUser):
             http.client.FORBIDDEN, response.status_code, response.content
         )
 
-    def test__clear_requires_parameters(self):
+    def test_clear_requires_parameters(self):
         self.become_admin()
         rack = factory.make_RackController()
         iface = rack.interface_set.first()
@@ -294,7 +294,7 @@ class TestDiscoveriesScanAPI(APITestCase.ForUser):
             http.client.BAD_REQUEST, response.status_code, response.content
         )
 
-    def test__clear_all_allowed_for_admin(self):
+    def test_clear_all_allowed_for_admin(self):
         self.become_admin()
         rack = factory.make_RackController()
         iface = rack.interface_set.first()
@@ -303,7 +303,7 @@ class TestDiscoveriesScanAPI(APITestCase.ForUser):
         response = self.client.post(uri, {"op": "clear", "all": "true"})
         self.assertEqual(204, response.status_code, response.content)
 
-    def test__clear_mdns_allowed_for_admin(self):
+    def test_clear_mdns_allowed_for_admin(self):
         self.become_admin()
         rack = factory.make_RackController()
         iface = rack.interface_set.first()
@@ -312,7 +312,7 @@ class TestDiscoveriesScanAPI(APITestCase.ForUser):
         response = self.client.post(uri, {"op": "clear", "mdns": "true"})
         self.assertEqual(204, response.status_code, response.content)
 
-    def test__clear_neighbours_allowed_for_admin(self):
+    def test_clear_neighbours_allowed_for_admin(self):
         self.become_admin()
         rack = factory.make_RackController()
         iface = rack.interface_set.first()
@@ -323,7 +323,7 @@ class TestDiscoveriesScanAPI(APITestCase.ForUser):
 
 
 class TestDiscoveriesClearByMACandIP(APITestCase.ForUser):
-    def test__clear_by_mac_and_ip_not_allowed_for_non_admin(self):
+    def test_clear_by_mac_and_ip_not_allowed_for_non_admin(self):
         rack = factory.make_RackController()
         iface = rack.interface_set.first()
         make_discoveries(interface=iface, count=3)
@@ -340,7 +340,7 @@ class TestDiscoveriesClearByMACandIP(APITestCase.ForUser):
             http.client.FORBIDDEN, response.status_code, response.content
         )
 
-    def test__clear_by_mac_and_ip_requires_parameters(self):
+    def test_clear_by_mac_and_ip_requires_parameters(self):
         self.become_admin()
         rack = factory.make_RackController()
         iface = rack.interface_set.first()
@@ -351,7 +351,7 @@ class TestDiscoveriesClearByMACandIP(APITestCase.ForUser):
             http.client.BAD_REQUEST, response.status_code, response.content
         )
 
-    def test__clear_by_mac_and_ip_allowed_for_admin(self):
+    def test_clear_by_mac_and_ip_allowed_for_admin(self):
         self.become_admin()
         rack = factory.make_RackController()
         iface = rack.interface_set.first()
@@ -470,7 +470,7 @@ def make_RPCResults(
 
 
 class TestInterpretsScanAllRackNetworksRPCResults(MAASTestCase):
-    def test__no_racks_available(self):
+    def test_no_racks_available(self):
         results = make_RPCResults(available=[], failed=[])
         result = get_scan_result_string_for_humans(results)
         self.assertThat(
@@ -480,7 +480,7 @@ class TestInterpretsScanAllRackNetworksRPCResults(MAASTestCase):
             ),
         )
 
-    def test__scan_not_started_on_at_least_one_rack(self):
+    def test_scan_not_started_on_at_least_one_rack(self):
         results = make_RPCResults(
             available=["x"], unavailable=["y", "z"], failed=[]
         )
@@ -490,12 +490,12 @@ class TestInterpretsScanAllRackNetworksRPCResults(MAASTestCase):
             DocTestMatches("Scanning could not be started on 2 rack..."),
         )
 
-    def test__scan_in_progress(self):
+    def test_scan_in_progress(self):
         results = make_RPCResults(available=["x"], unavailable=[], failed=[])
         result = get_scan_result_string_for_humans(results)
         self.assertThat(result, DocTestMatches("Scanning is in-progress..."))
 
-    def test__scan_failed_on_at_least_one_rack(self):
+    def test_scan_failed_on_at_least_one_rack(self):
         results = make_RPCResults(
             available=["x"], failed=["v", "w"], unavailable=["y", "z"]
         )
@@ -508,7 +508,7 @@ class TestInterpretsScanAllRackNetworksRPCResults(MAASTestCase):
             ),
         )
 
-    def test__failed_rack(self):
+    def test_failed_rack(self):
         results = make_RPCResults(
             available=["w"], failed=["w"], unavailable=[]
         )
@@ -550,7 +550,7 @@ class TestScanAllRackNetworksInterpretsRPCResults(MAASServerTestCase):
             timeout=self.timed_out,
         )
 
-    def test__populates_results_correctly(self):
+    def test_populates_results_correctly(self):
         result = user_friendly_scan_results(scan_all_rack_networks())
         self.assertThat(
             result,
@@ -573,12 +573,12 @@ class TestScanAllRackNetworksInterpretsRPCResults(MAASServerTestCase):
             ),
         )
 
-    def test__results_can_be_converted_to_json_and_back(self):
+    def test_results_can_be_converted_to_json_and_back(self):
         result = user_friendly_scan_results(scan_all_rack_networks())
         json_result = json.dumps(result)
         self.assertThat(json.loads(json_result), Equals(result))
 
-    def test__calls_racks_synchronously(self):
+    def test_calls_racks_synchronously(self):
         scan_all_rack_networks()
         self.assertThat(
             self.call_racks_sync_mock,
@@ -587,7 +587,7 @@ class TestScanAllRackNetworksInterpretsRPCResults(MAASServerTestCase):
             ),
         )
 
-    def test__calls_racks_synchronously_with_scan_all(self):
+    def test_calls_racks_synchronously_with_scan_all(self):
         scan_all_rack_networks(scan_all=True)
         self.assertThat(
             self.call_racks_sync_mock,
@@ -598,7 +598,7 @@ class TestScanAllRackNetworksInterpretsRPCResults(MAASServerTestCase):
             ),
         )
 
-    def test__calls_racks_synchronously_with_cidrs(self):
+    def test_calls_racks_synchronously_with_cidrs(self):
         subnet_query = Subnet.objects.filter(
             staticipaddress__interface__node__in=self.started
         )
@@ -617,7 +617,7 @@ class TestScanAllRackNetworksInterpretsRPCResults(MAASServerTestCase):
         controllers = self.call_racks_sync_mock.call_args[1]["controllers"]
         self.assertItemsEqual(self.started, controllers)
 
-    def test__calls_racks_synchronously_with_force_ping(self):
+    def test_calls_racks_synchronously_with_force_ping(self):
         scan_all_rack_networks(ping=True)
         self.assertThat(
             self.call_racks_sync_mock,
@@ -628,7 +628,7 @@ class TestScanAllRackNetworksInterpretsRPCResults(MAASServerTestCase):
             ),
         )
 
-    def test__calls_racks_synchronously_with_threads(self):
+    def test_calls_racks_synchronously_with_threads(self):
         threads = random.randint(1, 99)
         scan_all_rack_networks(threads=threads)
         self.assertThat(
@@ -640,7 +640,7 @@ class TestScanAllRackNetworksInterpretsRPCResults(MAASServerTestCase):
             ),
         )
 
-    def test__calls_racks_synchronously_with_slow(self):
+    def test_calls_racks_synchronously_with_slow(self):
         scan_all_rack_networks(slow=True)
         self.assertThat(
             self.call_racks_sync_mock,
diff --git a/src/maasserver/api/tests/test_doc.py b/src/maasserver/api/tests/test_doc.py
index 2b81cb7..8e5bca0 100644
--- a/src/maasserver/api/tests/test_doc.py
+++ b/src/maasserver/api/tests/test_doc.py
@@ -436,11 +436,11 @@ class TestDescribingAPI(MAASTestCase):
 class TestGeneratePowerTypesDoc(MAASTestCase):
     """Tests for `generate_power_types_doc`."""
 
-    def test__generate_power_types_doc_generates_doc(self):
+    def test_generate_power_types_doc_generates_doc(self):
         doc = generate_power_types_doc()
         self.assertThat(doc, ContainsAll(["Power types", "IPMI", "virsh"]))
 
-    def test__generate_power_types_doc_generates_describes_power_type(self):
+    def test_generate_power_types_doc_generates_describes_power_type(self):
         power_driver = random.choice(
             [
                 driver
@@ -465,11 +465,11 @@ class TestGeneratePowerTypesDoc(MAASTestCase):
 class TestGeneratePodTypesDoc(MAASTestCase):
     """Tests for `generate_pod_types_doc`."""
 
-    def test__generate_pod_types_doc_generates_doc(self):
+    def test_generate_pod_types_doc_generates_doc(self):
         doc = generate_pod_types_doc()
         self.assertThat(doc, ContainsAll(["Pod types", "virsh"]))
 
-    def test__generate_pod_types_doc_generates_describes_types(self):
+    def test_generate_pod_types_doc_generates_describes_types(self):
         pod_driver = random.choice([driver for _, driver in PodDriverRegistry])
         doc = generate_pod_types_doc()
         self.assertThat(
@@ -478,12 +478,12 @@ class TestGeneratePodTypesDoc(MAASTestCase):
 
 
 class TestDescribeCanonical(MAASTestCase):
-    def test__passes_True_False_and_None_through(self):
+    def test_passes_True_False_and_None_through(self):
         self.expectThat(describe_canonical(True), Is(True))
         self.expectThat(describe_canonical(False), Is(False))
         self.expectThat(describe_canonical(None), Is(None))
 
-    def test__passes_numbers_through(self):
+    def test_passes_numbers_through(self):
         self.expectThat(
             describe_canonical(1), MatchesAll(IsInstance(int), Equals(1))
         )
@@ -494,12 +494,12 @@ class TestDescribeCanonical(MAASTestCase):
             describe_canonical(1.0), MatchesAll(IsInstance(float), Equals(1.0))
         )
 
-    def test__passes_unicode_strings_through(self):
+    def test_passes_unicode_strings_through(self):
         string = factory.make_string()
         self.assertThat(string, IsInstance(str))
         self.expectThat(describe_canonical(string), Is(string))
 
-    def test__decodes_byte_strings(self):
+    def test_decodes_byte_strings(self):
         string = factory.make_string().encode("utf-8")
         self.expectThat(
             describe_canonical(string),
@@ -510,32 +510,32 @@ class TestDescribeCanonical(MAASTestCase):
             ),
         )
 
-    def test__returns_sequences_as_tuples(self):
+    def test_returns_sequences_as_tuples(self):
         self.expectThat(describe_canonical([1, 2, 3]), Equals((1, 2, 3)))
 
-    def test__recursively_calls_sequence_elements(self):
+    def test_recursively_calls_sequence_elements(self):
         self.expectThat(describe_canonical([1, [2, 3]]), Equals((1, (2, 3))))
 
-    def test__sorts_sequences(self):
+    def test_sorts_sequences(self):
         self.expectThat(describe_canonical([3, 1, 2]), Equals((1, 2, 3)))
         self.expectThat(
             describe_canonical([[1, 2], [1, 1]]), Equals(((1, 1), (1, 2)))
         )
 
-    def test__returns_mappings_as_tuples(self):
+    def test_returns_mappings_as_tuples(self):
         self.expectThat(describe_canonical({1: 2}), Equals(((1, 2),)))
 
-    def test__recursively_calls_mapping_keys_and_values(self):
+    def test_recursively_calls_mapping_keys_and_values(self):
         mapping = {"key\u1234".encode("utf-8"): ["b", "a", "r"]}
         expected = (("key\u1234", ("a", "b", "r")),)
         self.expectThat(describe_canonical(mapping), Equals(expected))
 
-    def test__sorts_mappings(self):
+    def test_sorts_mappings(self):
         self.expectThat(
             describe_canonical({2: 1, 1: 1}), Equals(((1, 1), (2, 1)))
         )
 
-    def test__sorts_mappings_by_key_and_value(self):
+    def test_sorts_mappings_by_key_and_value(self):
         class inth(int):
             """An `int` that hashes independently from its value.
 
@@ -560,20 +560,20 @@ class TestDescribeCanonical(MAASTestCase):
         )
         self.expectThat(describe_canonical(mapping), Equals(expected))
 
-    def test__rejects_other_types(self):
+    def test_rejects_other_types(self):
         self.assertRaises(TypeError, describe_canonical, lambda: None)
 
 
 class TestHashCanonical(MAASTestCase):
     """Tests for `hash_canonical`."""
 
-    def test__canonicalizes_argument(self):
+    def test_canonicalizes_argument(self):
         describe_canonical = self.patch(doc_module, "describe_canonical")
         describe_canonical.return_value = ""
         hash_canonical(sentinel.desc)
         self.assertThat(describe_canonical, MockCalledOnceWith(sentinel.desc))
 
-    def test__returns_hash_object(self):
+    def test_returns_hash_object(self):
         hasher = hash_canonical(factory.make_string())
         self.assertThat(
             hasher,
@@ -587,7 +587,7 @@ class TestHashCanonical(MAASTestCase):
             ),
         )
 
-    def test__misc_digests(self):
+    def test_misc_digests(self):
         def hexdigest(data):
             return hash_canonical(data).hexdigest()
 
@@ -634,7 +634,7 @@ class TestGetAPIDescriptionHash(MAASTestCase):
         with doc_module.api_description_hash_lock:
             doc_module.api_description_hash = None
 
-    def test__calculates_hash_from_api_description(self):
+    def test_calculates_hash_from_api_description(self):
         # Fake the API description.
         api_description = factory.make_string()
         api_description_hasher = hash_canonical(api_description)
@@ -645,7 +645,7 @@ class TestGetAPIDescriptionHash(MAASTestCase):
             Equals(api_description_hasher.hexdigest()),
         )
 
-    def test__caches_hash(self):
+    def test_caches_hash(self):
         # Fake the API description.
         api_description = factory.make_string()
         api_description_hasher = hash_canonical(api_description)
diff --git a/src/maasserver/api/tests/test_events.py b/src/maasserver/api/tests/test_events.py
index 70a5e3c..af600ca 100644
--- a/src/maasserver/api/tests/test_events.py
+++ b/src/maasserver/api/tests/test_events.py
@@ -73,7 +73,7 @@ def AfterBeingDecoded(matcher):
 class TestEventToDict(APITestCase.ForUser):
     """Test for `event_to_dict` function."""
 
-    def test__node_not_None(self):
+    def test_node_not_None(self):
         event = factory.make_Event()
         self.assertThat(
             event_to_dict(event),
@@ -93,7 +93,7 @@ class TestEventToDict(APITestCase.ForUser):
             ),
         )
 
-    def test__node_and_user_is_None(self):
+    def test_node_and_user_is_None(self):
         user = factory.make_User()
         node = factory.make_Node()
         event = factory.make_Event(node=node, user=user)
@@ -118,7 +118,7 @@ class TestEventToDict(APITestCase.ForUser):
             ),
         )
 
-    def test__type_level_AUDIT(self):
+    def test_type_level_AUDIT(self):
         event = factory.make_Event()
         self.assertThat(
             event_to_dict(event),
diff --git a/src/maasserver/api/tests/test_machine.py b/src/maasserver/api/tests/test_machine.py
index 7642950..d383c02 100644
--- a/src/maasserver/api/tests/test_machine.py
+++ b/src/maasserver/api/tests/test_machine.py
@@ -2477,7 +2477,7 @@ class TestSetStorageLayout(APITestCase.ForUser):
         """Get the API URI for `machine`."""
         return reverse("machine_handler", args=[machine.system_id])
 
-    def test__403_when_not_admin(self):
+    def test_403_when_not_admin(self):
         machine = factory.make_Node(status=NODE_STATUS.READY)
         response = self.client.post(
             self.get_machine_uri(machine), {"op": "set_storage_layout"}
@@ -2486,7 +2486,7 @@ class TestSetStorageLayout(APITestCase.ForUser):
             http.client.FORBIDDEN, response.status_code, response.content
         )
 
-    def test__409_when_machine_not_ready(self):
+    def test_409_when_machine_not_ready(self):
         self.become_admin()
         machine = factory.make_Node(status=NODE_STATUS.ALLOCATED)
         response = self.client.post(
@@ -2496,7 +2496,7 @@ class TestSetStorageLayout(APITestCase.ForUser):
             http.client.CONFLICT, response.status_code, response.content
         )
 
-    def test__400_when_storage_layout_missing(self):
+    def test_400_when_storage_layout_missing(self):
         self.become_admin()
         machine = factory.make_Node(status=NODE_STATUS.READY)
         response = self.client.post(
@@ -2510,7 +2510,7 @@ class TestSetStorageLayout(APITestCase.ForUser):
             json_load_bytes(response.content),
         )
 
-    def test__400_when_invalid_optional_param(self):
+    def test_400_when_invalid_optional_param(self):
         self.become_admin()
         machine = factory.make_Node(status=NODE_STATUS.READY)
         factory.make_PhysicalBlockDevice(node=machine)
@@ -2535,7 +2535,7 @@ class TestSetStorageLayout(APITestCase.ForUser):
             json_load_bytes(response.content),
         )
 
-    def test__400_when_no_boot_disk(self):
+    def test_400_when_no_boot_disk(self):
         self.become_admin()
         machine = factory.make_Node(
             status=NODE_STATUS.READY, with_boot_disk=False
@@ -2553,7 +2553,7 @@ class TestSetStorageLayout(APITestCase.ForUser):
             response.content.decode(settings.DEFAULT_CHARSET),
         )
 
-    def test__400_when_layout_error(self):
+    def test_400_when_layout_error(self):
         self.become_admin()
         machine = factory.make_Node(status=NODE_STATUS.READY)
         mock_set_storage_layout = self.patch(Machine, "set_storage_layout")
@@ -2572,7 +2572,7 @@ class TestSetStorageLayout(APITestCase.ForUser):
             response.content.decode(settings.DEFAULT_CHARSET),
         )
 
-    def test__400_when_layout_not_supported(self):
+    def test_400_when_layout_not_supported(self):
         self.become_admin()
         machine = factory.make_Node(status=NODE_STATUS.READY)
         factory.make_PhysicalBlockDevice(node=machine)
@@ -2589,7 +2589,7 @@ class TestSetStorageLayout(APITestCase.ForUser):
             response.content.decode(settings.DEFAULT_CHARSET),
         )
 
-    def test__calls_set_storage_layout_on_machine(self):
+    def test_calls_set_storage_layout_on_machine(self):
         self.become_admin()
         machine = factory.make_Node(status=NODE_STATUS.READY)
         mock_set_storage_layout = self.patch(Machine, "set_storage_layout")
@@ -2613,7 +2613,7 @@ class TestMountSpecial(APITestCase.ForUser):
         """Get the API URI for `machine`."""
         return reverse("machine_handler", args=[machine.system_id])
 
-    def test__fstype_and_mount_point_is_required_but_options_is_not(self):
+    def test_fstype_and_mount_point_is_required_but_options_is_not(self):
         machine = factory.make_Node(
             status=NODE_STATUS.ALLOCATED, owner=self.user
         )
@@ -2631,7 +2631,7 @@ class TestMountSpecial(APITestCase.ForUser):
             ),
         )
 
-    def test__fstype_must_be_a_non_storage_type(self):
+    def test_fstype_must_be_a_non_storage_type(self):
         machine = factory.make_Node(
             status=NODE_STATUS.ALLOCATED, owner=self.user
         )
@@ -2659,7 +2659,7 @@ class TestMountSpecial(APITestCase.ForUser):
                 "using fstype " + fstype,
             )
 
-    def test__mount_point_must_be_absolute(self):
+    def test_mount_point_must_be_absolute(self):
         machine = factory.make_Node(
             status=NODE_STATUS.ALLOCATED, owner=self.user
         )
@@ -2696,7 +2696,7 @@ class TestMountSpecialScenarios(APITestCase.ForUser):
         """Get the API URI for `machine`."""
         return reverse("machine_handler", args=[machine.system_id])
 
-    def test__machine_representation_includes_non_storage_filesystem(self):
+    def test_machine_representation_includes_non_storage_filesystem(self):
         self.become_admin()
         machine = factory.make_Node(status=NODE_STATUS.READY)
         filesystem = factory.make_Filesystem(node=machine, fstype=self.fstype)
@@ -2729,7 +2729,7 @@ class TestMountSpecialScenarios(APITestCase.ForUser):
             ),
         )
 
-    def test__only_acquired_special_filesystems(self):
+    def test_only_acquired_special_filesystems(self):
         self.become_admin()
         machine = factory.make_Node(status=NODE_STATUS.DEPLOYED)
         factory.make_Filesystem(
@@ -2767,7 +2767,7 @@ class TestMountSpecialScenarios(APITestCase.ForUser):
             ),
         )
 
-    def test__only_not_acquired_special_filesystems(self):
+    def test_only_not_acquired_special_filesystems(self):
         self.become_admin()
         machine = factory.make_Node(status=NODE_STATUS.READY)
         filesystem = factory.make_Filesystem(
@@ -2834,12 +2834,12 @@ class TestMountSpecialScenarios(APITestCase.ForUser):
             ),
         )
 
-    def test__user_mounts_non_storage_filesystem_on_allocated_machine(self):
+    def test_user_mounts_non_storage_filesystem_on_allocated_machine(self):
         self.assertCanMountFilesystem(
             factory.make_Node(status=NODE_STATUS.ALLOCATED, owner=self.user)
         )
 
-    def test__conflict_to_mount_on_non_ready_allocated_machine(self):
+    def test_conflict_to_mount_on_non_ready_allocated_machine(self):
         statuses = {name for name, _ in NODE_STATUS_CHOICES}
         statuses -= {NODE_STATUS.READY, NODE_STATUS.ALLOCATED}
         for status in statuses:
@@ -2859,19 +2859,19 @@ class TestMountSpecialScenarios(APITestCase.ForUser):
                 "using status %d" % status,
             )
 
-    def test__admin_mounts_non_storage_filesystem_on_allocated_machine(self):
+    def test_admin_mounts_non_storage_filesystem_on_allocated_machine(self):
         self.become_admin()
         self.assertCanMountFilesystem(
             factory.make_Node(status=NODE_STATUS.ALLOCATED, owner=self.user)
         )
 
-    def test__admin_mounts_non_storage_filesystem_on_ready_machine(self):
+    def test_admin_mounts_non_storage_filesystem_on_ready_machine(self):
         self.become_admin()
         self.assertCanMountFilesystem(
             factory.make_Node(status=NODE_STATUS.READY)
         )
 
-    def test__admin_cannot_mount_on_non_ready_or_allocated_machine(self):
+    def test_admin_cannot_mount_on_non_ready_or_allocated_machine(self):
         self.become_admin()
         statuses = {name for name, _ in NODE_STATUS_CHOICES}
         statuses -= {NODE_STATUS.READY, NODE_STATUS.ALLOCATED}
@@ -2900,7 +2900,7 @@ class TestUnmountSpecial(APITestCase.ForUser):
         """Get the API URI for `machine`."""
         return reverse("machine_handler", args=[machine.system_id])
 
-    def test__mount_point_is_required(self):
+    def test_mount_point_is_required(self):
         machine = factory.make_Node(
             status=NODE_STATUS.ALLOCATED, owner=self.user
         )
@@ -2913,7 +2913,7 @@ class TestUnmountSpecial(APITestCase.ForUser):
             Equals({"mount_point": ["This field is required."]}),
         )
 
-    def test__mount_point_must_be_absolute(self):
+    def test_mount_point_must_be_absolute(self):
         machine = factory.make_Node(
             status=NODE_STATUS.ALLOCATED, owner=self.user
         )
@@ -2964,12 +2964,12 @@ class TestUnmountSpecialScenarios(APITestCase.ForUser):
         )
         self.assertThat(Filesystem.objects.filter(node=machine), HasLength(0))
 
-    def test__user_unmounts_non_storage_filesystem_on_allocated_machine(self):
+    def test_user_unmounts_non_storage_filesystem_on_allocated_machine(self):
         self.assertCanUnmountFilesystem(
             factory.make_Node(status=NODE_STATUS.ALLOCATED, owner=self.user)
         )
 
-    def test__conflict_to_unmount_on_non_ready_allocated_machine(self):
+    def test_conflict_to_unmount_on_non_ready_allocated_machine(self):
         statuses = {name for name, _ in NODE_STATUS_CHOICES}
         statuses -= {NODE_STATUS.READY, NODE_STATUS.ALLOCATED}
         for status in statuses:
@@ -2992,19 +2992,19 @@ class TestUnmountSpecialScenarios(APITestCase.ForUser):
                 "using status %d" % status,
             )
 
-    def test__admin_unmounts_non_storage_filesystem_on_allocated_machine(self):
+    def test_admin_unmounts_non_storage_filesystem_on_allocated_machine(self):
         self.become_admin()
         self.assertCanUnmountFilesystem(
             factory.make_Node(status=NODE_STATUS.ALLOCATED, owner=self.user)
         )
 
-    def test__admin_unmounts_non_storage_filesystem_on_ready_machine(self):
+    def test_admin_unmounts_non_storage_filesystem_on_ready_machine(self):
         self.become_admin()
         self.assertCanUnmountFilesystem(
             factory.make_Node(status=NODE_STATUS.READY)
         )
 
-    def test__admin_cannot_unmount_on_non_ready_or_allocated_machine(self):
+    def test_admin_cannot_unmount_on_non_ready_or_allocated_machine(self):
         self.become_admin()
         statuses = {name for name, _ in NODE_STATUS_CHOICES}
         statuses -= {NODE_STATUS.READY, NODE_STATUS.ALLOCATED}
@@ -3034,7 +3034,7 @@ class TestDefaultGateways(APITestCase.ForUser):
         """Get the API URI for `machine`."""
         return reverse("machine_handler", args=[machine.system_id])
 
-    def test__403_when_not_admin(self):
+    def test_403_when_not_admin(self):
         machine = factory.make_Node(
             owner=self.user, status=NODE_STATUS.ALLOCATED
         )
@@ -3045,7 +3045,7 @@ class TestDefaultGateways(APITestCase.ForUser):
             http.client.FORBIDDEN, response.status_code, response.content
         )
 
-    def test__clears_default_gateways(self):
+    def test_clears_default_gateways(self):
         self.become_admin()
         machine = factory.make_Node(
             owner=self.user, status=NODE_STATUS.ALLOCATED
@@ -3086,7 +3086,7 @@ class TestDefaultGateways(APITestCase.ForUser):
         self.assertIsNone(machine.gateway_link_ipv4)
         self.assertIsNone(machine.gateway_link_ipv6)
 
-    def test__returns_null_gateway_if_no_explicit_gateway_exists(self):
+    def test_returns_null_gateway_if_no_explicit_gateway_exists(self):
         machine = factory.make_Node(
             owner=self.user, status=NODE_STATUS.ALLOCATED
         )
@@ -3128,7 +3128,7 @@ class TestDefaultGateways(APITestCase.ForUser):
             ),
         )
 
-    def test__returns_effective_gateway_if_no_explicit_gateway_set(self):
+    def test_returns_effective_gateway_if_no_explicit_gateway_set(self):
         machine = factory.make_Node(
             owner=self.user, status=NODE_STATUS.ALLOCATED
         )
@@ -3176,7 +3176,7 @@ class TestDefaultGateways(APITestCase.ForUser):
             ),
         )
 
-    def test__returns_links_if_set(self):
+    def test_returns_links_if_set(self):
         machine = factory.make_Node(
             owner=self.user, status=NODE_STATUS.ALLOCATED
         )
@@ -3233,7 +3233,7 @@ class TestGetCurtinConfig(APITestCase.ForUser):
         """Get the API URI for `machine`."""
         return reverse("machine_handler", args=[machine.system_id])
 
-    def test__500_when_machine_not_in_deployment_state(self):
+    def test_500_when_machine_not_in_deployment_state(self):
         machine = factory.make_Node(
             owner=self.user,
             status=factory.pick_enum(
@@ -3252,7 +3252,7 @@ class TestGetCurtinConfig(APITestCase.ForUser):
             http.client.BAD_REQUEST, response.status_code, response.content
         )
 
-    def test__returns_curtin_config_in_yaml(self):
+    def test_returns_curtin_config_in_yaml(self):
         machine = factory.make_Node(
             owner=self.user, status=NODE_STATUS.DEPLOYING
         )
diff --git a/src/maasserver/api/tests/test_machines.py b/src/maasserver/api/tests/test_machines.py
index 9b2e78f..98c4485 100644
--- a/src/maasserver/api/tests/test_machines.py
+++ b/src/maasserver/api/tests/test_machines.py
@@ -3539,7 +3539,7 @@ class TestPowerState(APITransactionTestCase.ForUser):
         )  # Wait for all pending tasks to run.
         self.assertThat(reload_object(machine).power_state, Equals(state))
 
-    def test__returns_actual_state(self):
+    def test_returns_actual_state(self):
         machine = factory.make_Node_with_Interface_on_Subnet(power_type="ipmi")
         random_state = random.choice(["on", "off", "error"])
         self.prepare_rpc(
diff --git a/src/maasserver/api/tests/test_subnets.py b/src/maasserver/api/tests/test_subnets.py
index ac33221..c1e8c6e 100644
--- a/src/maasserver/api/tests/test_subnets.py
+++ b/src/maasserver/api/tests/test_subnets.py
@@ -413,7 +413,7 @@ class TestSubnetAPI(APITestCase.ForUser):
 class TestSubnetAPIAuth(APITestCase.ForAnonymous):
     """Authorization tests for subnet API."""
 
-    def test__reserved_ip_ranges_fails_if_not_logged_in(self):
+    def test_reserved_ip_ranges_fails_if_not_logged_in(self):
         subnet = factory.make_Subnet()
         response = self.client.get(
             get_subnet_uri(subnet), {"op": "reserved_ip_ranges"}
@@ -424,7 +424,7 @@ class TestSubnetAPIAuth(APITestCase.ForAnonymous):
             explain_unexpected_response(http.client.UNAUTHORIZED, response),
         )
 
-    def test__unreserved_ip_ranges_fails_if_not_logged_in(self):
+    def test_unreserved_ip_ranges_fails_if_not_logged_in(self):
         subnet = factory.make_Subnet()
         response = self.client.get(
             get_subnet_uri(subnet), {"op": "unreserved_ip_ranges"}
@@ -437,7 +437,7 @@ class TestSubnetAPIAuth(APITestCase.ForAnonymous):
 
 
 class TestSubnetReservedIPRangesAPI(APITestCase.ForUser):
-    def test__returns_empty_list_for_empty_ipv4_subnet(self):
+    def test_returns_empty_list_for_empty_ipv4_subnet(self):
         subnet = factory.make_Subnet(version=4, dns_servers=[], gateway_ip="")
         response = self.client.get(
             get_subnet_uri(subnet), {"op": "reserved_ip_ranges"}
@@ -450,7 +450,7 @@ class TestSubnetReservedIPRangesAPI(APITestCase.ForUser):
         result = json.loads(response.content.decode(settings.DEFAULT_CHARSET))
         self.assertThat(result, Equals([]))
 
-    def test__returns_reserved_anycast_for_empty_ipv6_subnet(self):
+    def test_returns_reserved_anycast_for_empty_ipv6_subnet(self):
         subnet = factory.make_Subnet(version=6, dns_servers=[], gateway_ip="")
         response = self.client.get(
             get_subnet_uri(subnet), {"op": "reserved_ip_ranges"}
@@ -465,7 +465,7 @@ class TestSubnetReservedIPRangesAPI(APITestCase.ForUser):
         self.assertThat(result[0]["num_addresses"], Equals(1))
         self.assertThat(result[0]["purpose"], Contains("rfc-4291-2.6.1"))
 
-    def test__accounts_for_reserved_ip_address(self):
+    def test_accounts_for_reserved_ip_address(self):
         subnet = factory.make_Subnet(dns_servers=[], gateway_ip="")
         ip = factory.pick_ip_in_network(subnet.get_ipnetwork())
         factory.make_StaticIPAddress(
@@ -494,7 +494,7 @@ class TestSubnetReservedIPRangesAPI(APITestCase.ForUser):
 
 
 class TestSubnetUnreservedIPRangesAPI(APITestCase.ForUser):
-    def test__returns_full_list_for_empty_subnet(self):
+    def test_returns_full_list_for_empty_subnet(self):
         subnet = factory.make_Subnet(
             cidr=factory.make_ipv4_network(), dns_servers=[], gateway_ip=""
         )
@@ -548,7 +548,7 @@ class TestSubnetUnreservedIPRangesAPI(APITestCase.ForUser):
         )
         self.assertThat(result, Equals([]), str(subnet.get_ipranges_in_use()))
 
-    def test__returns_empty_list_for_full_ipv4_subnet(self):
+    def test_returns_empty_list_for_full_ipv4_subnet(self):
         network = factory.make_ipv4_network()
         subnet = factory.make_Subnet(cidr=str(network.cidr), dns_servers=[])
         network = subnet.get_ipnetwork()
@@ -556,7 +556,7 @@ class TestSubnetUnreservedIPRangesAPI(APITestCase.ForUser):
         last_address = inet_ntop(network.last - 1)  # Skip broadcast.
         self._unreserved_ip_ranges_empty(subnet, first_address, last_address)
 
-    def test__returns_empty_list_for_full_ipv6_subnet(self):
+    def test_returns_empty_list_for_full_ipv6_subnet(self):
         network = factory.make_ipv6_network(slash=random.randint(112, 119))
         subnet = factory.make_Subnet(cidr=str(network.cidr), dns_servers=[])
         network = subnet.get_ipnetwork()
@@ -565,7 +565,7 @@ class TestSubnetUnreservedIPRangesAPI(APITestCase.ForUser):
         self._unreserved_ip_ranges_empty(subnet, first_address, last_address)
 
     # Slash-64 ipv6 subnets get a special range put in them - test separately.
-    def test__returns_empty_list_for_full_ipv6_slash_64_subnet(self):
+    def test_returns_empty_list_for_full_ipv6_slash_64_subnet(self):
         network = factory.make_ipv6_network(slash=64)
         subnet = factory.make_Subnet(cidr=str(network.cidr), dns_servers=[])
         network = subnet.get_ipnetwork()
@@ -575,7 +575,7 @@ class TestSubnetUnreservedIPRangesAPI(APITestCase.ForUser):
         last_address = inet_ntop(network.last)
         self._unreserved_ip_ranges_empty(subnet, first_address, last_address)
 
-    def test__accounts_for_reserved_ip_address(self):
+    def test_accounts_for_reserved_ip_address(self):
         subnet = factory.make_ipv4_Subnet_with_IPRanges(
             with_dynamic_range=False, dns_servers=[], with_router=False
         )
@@ -635,7 +635,7 @@ class TestSubnetUnreservedIPRangesAPI(APITestCase.ForUser):
 
 
 class TestSubnetStatisticsAPI(APITestCase.ForUser):
-    def test__default_does_not_include_ranges(self):
+    def test_default_does_not_include_ranges(self):
         subnet = factory.make_Subnet()
         factory.make_StaticIPAddress(
             alloc_type=IPADDRESS_TYPE.USER_RESERVED, subnet=subnet
@@ -654,7 +654,7 @@ class TestSubnetStatisticsAPI(APITestCase.ForUser):
         expected_result = statistics.render_json(include_ranges=False)
         self.assertThat(result, Equals(expected_result))
 
-    def test__with_include_ranges(self):
+    def test_with_include_ranges(self):
         subnet = factory.make_Subnet()
         factory.make_StaticIPAddress(
             alloc_type=IPADDRESS_TYPE.USER_RESERVED, subnet=subnet
@@ -674,7 +674,7 @@ class TestSubnetStatisticsAPI(APITestCase.ForUser):
         expected_result = statistics.render_json(include_ranges=True)
         self.assertThat(result, Equals(expected_result))
 
-    def test__without_include_ranges(self):
+    def test_without_include_ranges(self):
         subnet = factory.make_Subnet()
         factory.make_StaticIPAddress(
             alloc_type=IPADDRESS_TYPE.USER_RESERVED, subnet=subnet
@@ -696,7 +696,7 @@ class TestSubnetStatisticsAPI(APITestCase.ForUser):
 
 
 class TestSubnetIPAddressesAPI(APITestCase.ForUser):
-    def test__default_parameters(self):
+    def test_default_parameters(self):
         subnet = factory.make_Subnet()
         user = factory.make_User()
         node = factory.make_Node_with_Interface_on_Subnet(
@@ -725,7 +725,7 @@ class TestSubnetIPAddressesAPI(APITestCase.ForUser):
         )
         self.assertThat(result, Equals(expected_result))
 
-    def test__with_username_false(self):
+    def test_with_username_false(self):
         subnet = factory.make_Subnet()
         user = factory.make_User()
         node = factory.make_Node_with_Interface_on_Subnet(
@@ -755,7 +755,7 @@ class TestSubnetIPAddressesAPI(APITestCase.ForUser):
         )
         self.assertThat(result, Equals(expected_result))
 
-    def test__with_summary_false(self):
+    def test_with_summary_false(self):
         subnet = factory.make_Subnet()
         user = factory.make_User()
         node = factory.make_Node_with_Interface_on_Subnet(
@@ -785,7 +785,7 @@ class TestSubnetIPAddressesAPI(APITestCase.ForUser):
         )
         self.assertThat(result, Equals(expected_result))
 
-    def test__with_deprecated_node_summary_false(self):
+    def test_with_deprecated_node_summary_false(self):
         subnet = factory.make_Subnet()
         user = factory.make_User()
         node = factory.make_Node_with_Interface_on_Subnet(
diff --git a/src/maasserver/api/tests/test_support.py b/src/maasserver/api/tests/test_support.py
index 0a75bc3..8f323b6 100644
--- a/src/maasserver/api/tests/test_support.py
+++ b/src/maasserver/api/tests/test_support.py
@@ -176,7 +176,7 @@ class TestOperationsHandlerMixin(MAASTestCase):
     def make_handler(self, **namespace):
         return type("TestHandler", (OperationsHandlerMixin,), namespace)
 
-    def test__decorate_decorates_exports(self):
+    def test_decorate_decorates_exports(self):
         handler = self.make_handler(
             exports={"foo": sentinel.foo, "bar": sentinel.bar}
         )
@@ -185,7 +185,7 @@ class TestOperationsHandlerMixin(MAASTestCase):
             {"foo": "SENTINEL.FOO", "bar": "SENTINEL.BAR"}, handler.exports
         )
 
-    def test__decorate_decorates_anonymous_exports(self):
+    def test_decorate_decorates_anonymous_exports(self):
         handler = self.make_handler(exports={"foo": sentinel.foo})
         handler.anonymous = self.make_handler(exports={"bar": sentinel.bar})
         handler.decorate(lambda thing: str(thing).upper())
diff --git a/src/maasserver/api/tests/test_users.py b/src/maasserver/api/tests/test_users.py
index 30aa805..2ecb002 100644
--- a/src/maasserver/api/tests/test_users.py
+++ b/src/maasserver/api/tests/test_users.py
@@ -253,7 +253,7 @@ class TestUsers(APITestCase.ForUser):
             ContainsAll([user.username for user in users]),
         )
 
-    def test__whoami_returns_user(self):
+    def test_whoami_returns_user(self):
         factory.make_User()
         response = self.client.get(reverse("users_handler"), {"op": "whoami"})
         self.assertEqual(
@@ -262,7 +262,7 @@ class TestUsers(APITestCase.ForUser):
         result = json.loads(response.content.decode(settings.DEFAULT_CHARSET))
         self.assertThat(result["username"], Equals(self.user.username))
 
-    def test__whoami_returns_forbidden_if_not_logged_in(self):
+    def test_whoami_returns_forbidden_if_not_logged_in(self):
         self.client.logout()
         factory.make_User()
         response = self.client.get(reverse("users_handler"), {"op": "whoami"})
diff --git a/src/maasserver/clusterrpc/tests/test_boot_images.py b/src/maasserver/clusterrpc/tests/test_boot_images.py
index 09d4493..f557025 100644
--- a/src/maasserver/clusterrpc/tests/test_boot_images.py
+++ b/src/maasserver/clusterrpc/tests/test_boot_images.py
@@ -408,7 +408,7 @@ class TestGetBootImagesFor(MAASTransactionServerTestCase):
 class TestRackControllersImporter(MAASServerTestCase):
     """Tests for `RackControllersImporter`."""
 
-    def test__init_with_single_system_id(self):
+    def test_init_with_single_system_id(self):
         system_id = factory.make_name("system_id")
         sources = [sentinel.source]
         proxy = factory.make_simple_http_url()
@@ -424,7 +424,7 @@ class TestRackControllersImporter(MAASServerTestCase):
             ),
         )
 
-    def test__init_with_multiple_ssytem_ids(self):
+    def test_init_with_multiple_ssytem_ids(self):
         system_ids = [factory.make_name("system_id") for _ in range(3)]
         sources = [sentinel.source]
         proxy = factory.make_simple_http_url()
@@ -440,20 +440,20 @@ class TestRackControllersImporter(MAASServerTestCase):
             ),
         )
 
-    def test__init_also_accepts_already_parsed_proxy(self):
+    def test_init_also_accepts_already_parsed_proxy(self):
         proxy = urlparse(factory.make_simple_http_url())
         importer = RackControllersImporter(
             sentinel.system_id, [sentinel.source], proxy
         )
         self.assertThat(importer, MatchesStructure(proxy=Is(proxy)))
 
-    def test__init_also_accepts_no_proxy(self):
+    def test_init_also_accepts_no_proxy(self):
         importer = RackControllersImporter(
             sentinel.system_id, [sentinel.source]
         )
         self.assertThat(importer, MatchesStructure(proxy=Is(None)))
 
-    def test__schedule_arranges_for_later_run(self):
+    def test_schedule_arranges_for_later_run(self):
         # Avoid deferring to the database.
         self.patch(boot_images_module, "deferToDatabase", maybeDeferred)
         # Avoid actually initiating a run.
@@ -495,7 +495,7 @@ class TestRackControllersImporter(MAASServerTestCase):
             ),
         )
 
-    def test__run_will_not_error_instead_it_logs(self):
+    def test_run_will_not_error_instead_it_logs(self):
         call = self.patch(RackControllersImporter, "__call__")
         call.return_value = fail(ZeroDivisionError())
 
@@ -516,11 +516,11 @@ class TestRackControllersImporter(MAASServerTestCase):
 class TestRackControllersImporterNew(MAASServerTestCase):
     """Tests for the `RackControllersImporter.new` function."""
 
-    def test__new_obtains_system_ids_if_not_given(self):
+    def test_new_obtains_system_ids_if_not_given(self):
         importer = RackControllersImporter.new(sources=[], proxy=None)
         self.assertThat(importer, MatchesStructure(system_ids=Equals(())))
 
-    def test__new_obtains_system_ids_for_accepted_clusters_if_not_given(self):
+    def test_new_obtains_system_ids_for_accepted_clusters_if_not_given(self):
         rack = factory.make_RackController()
 
         importer = RackControllersImporter.new(sources=[], proxy=None)
@@ -529,14 +529,14 @@ class TestRackControllersImporterNew(MAASServerTestCase):
             importer, MatchesStructure(system_ids=Equals((rack.system_id,)))
         )
 
-    def test__new_obtains_sources_if_not_given(self):
+    def test_new_obtains_sources_if_not_given(self):
         importer = RackControllersImporter.new(system_ids=[], proxy=None)
         self.assertThat(
             importer,
             MatchesStructure(sources=Equals([get_simplestream_endpoint()])),
         )
 
-    def test__new_obtains_proxy_if_not_given(self):
+    def test_new_obtains_proxy_if_not_given(self):
         # Disable boot source cache signals.
         self.addCleanup(bootsources.signals.enable)
         bootsources.signals.disable()
@@ -548,7 +548,7 @@ class TestRackControllersImporterNew(MAASServerTestCase):
             importer, MatchesStructure(proxy=Equals(urlparse(proxy)))
         )
 
-    def test__new_obtains_None_proxy_if_disabled(self):
+    def test_new_obtains_None_proxy_if_disabled(self):
         # Disable boot source cache signals.
         self.addCleanup(bootsources.signals.enable)
         bootsources.signals.disable()
@@ -572,7 +572,7 @@ class TestRackControllersImporterInAction(MAASTransactionServerTestCase):
         # This fixture allows us to simulate mock clusters.
         self.rpc = self.useFixture(MockLiveRegionToClusterRPCFixture())
 
-    def test__calling_importer_issues_rpc_calls_to_clusters(self):
+    def test_calling_importer_issues_rpc_calls_to_clusters(self):
         # Some clusters that we'll ask to import resources.
         rack_1 = factory.make_RackController()
         rack_2 = factory.make_RackController()
@@ -610,7 +610,7 @@ class TestRackControllersImporterInAction(MAASTransactionServerTestCase):
             ),
         )
 
-    def test__run_calls_importer_and_reports_results(self):
+    def test_run_calls_importer_and_reports_results(self):
         # Some clusters that we'll ask to import resources.
         rack_1 = factory.make_RackController()
         rack_2 = factory.make_RackController()
diff --git a/src/maasserver/clusterrpc/tests/test_driver_parameters.py b/src/maasserver/clusterrpc/tests/test_driver_parameters.py
index 5f1c73a..6e31cad 100644
--- a/src/maasserver/clusterrpc/tests/test_driver_parameters.py
+++ b/src/maasserver/clusterrpc/tests/test_driver_parameters.py
@@ -87,7 +87,7 @@ class TestGetPowerTypeParametersFromJSON(MAASServerTestCase):
         for name, field in power_type_parameters.items():
             self.assertIsInstance(field, DictCharField)
 
-    def test__overrides_defaults(self):
+    def test_overrides_defaults(self):
         name = factory.make_name("name")
         field_name = factory.make_name("field_name")
         new_default = factory.make_name("new default")
@@ -114,7 +114,7 @@ class TestGetPowerTypeParametersFromJSON(MAASServerTestCase):
             new_default, power_type_parameters[name].fields[0].initial
         )
 
-    def test__manual_does_not_require_power_params(self):
+    def test_manual_does_not_require_power_params(self):
         json_parameters = [
             {
                 "driver_type": "power",
@@ -140,7 +140,7 @@ class TestGetPowerTypeParametersFromJSON(MAASServerTestCase):
 class TestMakeFormField(MAASServerTestCase):
     """Test that make_form_field() converts JSON fields to Django."""
 
-    def test__creates_char_field_for_strings(self):
+    def test_creates_char_field_for_strings(self):
         json_field = {
             "name": "some_field",
             "label": "Some Field",
@@ -150,7 +150,7 @@ class TestMakeFormField(MAASServerTestCase):
         django_field = make_form_field(json_field)
         self.assertIsInstance(django_field, forms.CharField)
 
-    def test__creates_string_field_for_passwords(self):
+    def test_creates_string_field_for_passwords(self):
         json_field = {
             "name": "some_field",
             "label": "Some Field",
@@ -160,7 +160,7 @@ class TestMakeFormField(MAASServerTestCase):
         django_field = make_form_field(json_field)
         self.assertIsInstance(django_field, forms.CharField)
 
-    def test__creates_choice_field_for_choices(self):
+    def test_creates_choice_field_for_choices(self):
         json_field = {
             "name": "some_field",
             "label": "Some Field",
@@ -183,7 +183,7 @@ class TestMakeFormField(MAASServerTestCase):
         )
         self.assertEqual(json_field["default"], django_field.initial)
 
-    def test__creates_mac_address_field_for_mac_addresses(self):
+    def test_creates_mac_address_field_for_mac_addresses(self):
         json_field = {
             "name": "some_field",
             "label": "Some Field",
@@ -193,7 +193,7 @@ class TestMakeFormField(MAASServerTestCase):
         django_field = make_form_field(json_field)
         self.assertIsInstance(django_field, MACAddressFormField)
 
-    def test__sets_properties_on_form_field(self):
+    def test_sets_properties_on_form_field(self):
         json_field = {
             "name": "some_field",
             "label": "Some Field",
@@ -206,7 +206,7 @@ class TestMakeFormField(MAASServerTestCase):
             (django_field.label, django_field.required),
         )
 
-    def test__sets_initial_to_default(self):
+    def test_sets_initial_to_default(self):
         json_field = {
             "name": "some_field",
             "label": "Some Field",
@@ -221,11 +221,11 @@ class TestMakeFormField(MAASServerTestCase):
 class TestMakeSettingField(MAASServerTestCase):
     """Test that make_setting_field() creates JSON-verifiable fields."""
 
-    def test__returns_json_verifiable_dict(self):
+    def test_returns_json_verifiable_dict(self):
         json_field = make_setting_field("some_field", "Some Label")
         jsonschema.validate(json_field, SETTING_PARAMETER_FIELD_SCHEMA)
 
-    def test__provides_sane_default_values(self):
+    def test_provides_sane_default_values(self):
         json_field = make_setting_field("some_field", "Some Label")
         expected_field = {
             "name": "some_field",
@@ -238,7 +238,7 @@ class TestMakeSettingField(MAASServerTestCase):
         }
         self.assertEqual(expected_field, json_field)
 
-    def test__sets_field_values(self):
+    def test_sets_field_values(self):
         expected_field = {
             "name": "yet_another_field",
             "label": "Can I stop writing tests now?",
@@ -251,7 +251,7 @@ class TestMakeSettingField(MAASServerTestCase):
         json_field = make_setting_field(**expected_field)
         self.assertEqual(expected_field, json_field)
 
-    def test__validates_choices(self):
+    def test_validates_choices(self):
         self.assertRaises(
             jsonschema.ValidationError,
             make_setting_field,
@@ -260,7 +260,7 @@ class TestMakeSettingField(MAASServerTestCase):
             choices="Nonsense",
         )
 
-    def test__creates_password_fields(self):
+    def test_creates_password_fields(self):
         json_field = make_setting_field(
             "some_field", "Some Label", field_type="password"
         )
diff --git a/src/maasserver/clusterrpc/tests/test_pods.py b/src/maasserver/clusterrpc/tests/test_pods.py
index 3c8ecbe..3d43d7b 100644
--- a/src/maasserver/clusterrpc/tests/test_pods.py
+++ b/src/maasserver/clusterrpc/tests/test_pods.py
@@ -52,7 +52,7 @@ class TestDiscoverPod(MAASTransactionServerTestCase):
 
     @wait_for_reactor
     @inlineCallbacks
-    def test__calls_DiscoverPod_on_all_clients(self):
+    def test_calls_DiscoverPod_on_all_clients(self):
         rack_ids = [factory.make_name("system_id") for _ in range(3)]
         pod = DiscoveredPod(
             architectures=["amd64/generic"],
@@ -82,7 +82,7 @@ class TestDiscoverPod(MAASTransactionServerTestCase):
 
     @wait_for_reactor
     @inlineCallbacks
-    def test__returns_discovered_pod_and_errors(self):
+    def test_returns_discovered_pod_and_errors(self):
         pod_type = factory.make_name("pod")
         pod = DiscoveredPod(
             architectures=["amd64/generic"],
@@ -120,7 +120,7 @@ class TestDiscoverPod(MAASTransactionServerTestCase):
 
     @wait_for_reactor
     @inlineCallbacks
-    def test__handles_timeout(self):
+    def test_handles_timeout(self):
         def defer_way_later(*args, **kwargs):
             # Create a defer that will finish in 1 minute.
             return deferLater(reactor, 60 * 60, lambda: None)
@@ -215,7 +215,7 @@ class TestGetBestDiscoveredResult(MAASTestCase):
 class TestSendPodCommissioningResults(MAASServerTestCase):
     """Tests for `send_pod_commissioning_results`."""
 
-    def test__calls_and_returns_correctly(self):
+    def test_calls_and_returns_correctly(self):
         pod = factory.make_Pod()
         node = factory.make_Node()
         token = NodeKey.objects.get_token_for_node(node)
@@ -252,7 +252,7 @@ class TestSendPodCommissioningResults(MAASServerTestCase):
             ),
         )
 
-    def test__raises_PodProblem_for_UnknownPodType(self):
+    def test_raises_PodProblem_for_UnknownPodType(self):
         pod = factory.make_Pod()
         node = factory.make_Node()
         token = NodeKey.objects.get_token_for_node(node)
@@ -280,7 +280,7 @@ class TestSendPodCommissioningResults(MAASServerTestCase):
             str(error),
         )
 
-    def test__raises_PodProblem_for_NotImplementedError(self):
+    def test_raises_PodProblem_for_NotImplementedError(self):
         pod = factory.make_Pod()
         node = factory.make_Node()
         token = NodeKey.objects.get_token_for_node(node)
@@ -309,7 +309,7 @@ class TestSendPodCommissioningResults(MAASServerTestCase):
             str(error),
         )
 
-    def test__raises_PodProblem_for_PodActionFail(self):
+    def test_raises_PodProblem_for_PodActionFail(self):
         pod = factory.make_Pod()
         node = factory.make_Node()
         token = NodeKey.objects.get_token_for_node(node)
@@ -338,7 +338,7 @@ class TestSendPodCommissioningResults(MAASServerTestCase):
             str(error),
         )
 
-    def test__raises_same_exception(self):
+    def test_raises_same_exception(self):
         pod = factory.make_Pod()
         node = factory.make_Node()
         token = NodeKey.objects.get_token_for_node(node)
@@ -368,7 +368,7 @@ class TestSendPodCommissioningResults(MAASServerTestCase):
 class TestComposeMachine(MAASServerTestCase):
     """Tests for `compose_machine`."""
 
-    def test__calls_and_returns_correctly(self):
+    def test_calls_and_returns_correctly(self):
         pod = factory.make_Pod()
         client = Mock()
         client.return_value = succeed(
@@ -398,7 +398,7 @@ class TestComposeMachine(MAASServerTestCase):
         self.assertEqual(sentinel.machine, machine)
         self.assertEqual(sentinel.hints, hints)
 
-    def test__raises_PodProblem_for_UnknownPodType(self):
+    def test_raises_PodProblem_for_UnknownPodType(self):
         pod = factory.make_Pod()
         client = Mock()
         client.return_value = fail(UnknownPodType(pod.power_type))
@@ -419,7 +419,7 @@ class TestComposeMachine(MAASServerTestCase):
             str(error),
         )
 
-    def test__raises_PodProblem_for_NotImplementedError(self):
+    def test_raises_PodProblem_for_NotImplementedError(self):
         pod = factory.make_Pod()
         client = Mock()
         client.return_value = fail(NotImplementedError())
@@ -440,7 +440,7 @@ class TestComposeMachine(MAASServerTestCase):
             str(error),
         )
 
-    def test__raises_PodProblem_for_PodActionFail(self):
+    def test_raises_PodProblem_for_PodActionFail(self):
         pod = factory.make_Pod()
         error_msg = factory.make_name("error")
         client = Mock()
@@ -460,7 +460,7 @@ class TestComposeMachine(MAASServerTestCase):
             "Unable to compose machine because: %s" % error_msg, str(error)
         )
 
-    def test__raises_same_exception(self):
+    def test_raises_same_exception(self):
         pod = factory.make_Pod()
         client = Mock()
         exception_type = factory.make_exception_type()
@@ -483,7 +483,7 @@ class TestComposeMachine(MAASServerTestCase):
 class TestDecomposeMachine(MAASServerTestCase):
     """Tests for `decompose_machine`."""
 
-    def test__calls_and_returns_correctly(self):
+    def test_calls_and_returns_correctly(self):
         hints = DiscoveredPodHints(
             cores=random.randint(1, 8),
             cpu_speed=random.randint(1000, 2000),
@@ -510,7 +510,7 @@ class TestDecomposeMachine(MAASServerTestCase):
         )
         self.assertEqual(hints, result)
 
-    def test__raises_PodProblem_for_UnknownPodType(self):
+    def test_raises_PodProblem_for_UnknownPodType(self):
         pod = factory.make_Pod()
         client = Mock()
         client.return_value = fail(UnknownPodType(pod.power_type))
@@ -530,7 +530,7 @@ class TestDecomposeMachine(MAASServerTestCase):
             str(error),
         )
 
-    def test__raises_PodProblem_for_NotImplementedError(self):
+    def test_raises_PodProblem_for_NotImplementedError(self):
         pod = factory.make_Pod()
         client = Mock()
         client.return_value = fail(NotImplementedError())
@@ -550,7 +550,7 @@ class TestDecomposeMachine(MAASServerTestCase):
             str(error),
         )
 
-    def test__raises_PodProblem_for_PodActionFail(self):
+    def test_raises_PodProblem_for_PodActionFail(self):
         pod = factory.make_Pod()
         error_msg = factory.make_name("error")
         client = Mock()
@@ -569,7 +569,7 @@ class TestDecomposeMachine(MAASServerTestCase):
             "Unable to decompose machine because: %s" % error_msg, str(error)
         )
 
-    def test__raises_same_exception(self):
+    def test_raises_same_exception(self):
         pod = factory.make_Pod()
         client = Mock()
         exception_type = factory.make_exception_type()
diff --git a/src/maasserver/clusterrpc/tests/test_power.py b/src/maasserver/clusterrpc/tests/test_power.py
index 5af7672..e125974 100644
--- a/src/maasserver/clusterrpc/tests/test_power.py
+++ b/src/maasserver/clusterrpc/tests/test_power.py
@@ -54,7 +54,7 @@ class TestPowerNode(MAASServerTestCase):
         ("PowerOff", {"power_func": power_off_node, "command": PowerOff}),
     )
 
-    def test__powers_single_node(self):
+    def test_powers_single_node(self):
         node = factory.make_Node()
         client = Mock()
 
@@ -77,7 +77,7 @@ class TestPowerNode(MAASServerTestCase):
             ),
         )
 
-    def test__raises_power_problem(self):
+    def test_raises_power_problem(self):
         node = factory.make_Node()
         client = Mock()
         client.return_value = fail(
@@ -96,7 +96,7 @@ class TestPowerNode(MAASServerTestCase):
 class TestPowerCycle(MAASServerTestCase):
     """Tests for `power_cycle`."""
 
-    def test__power_cycles_single_node(self):
+    def test_power_cycles_single_node(self):
         node = factory.make_Node()
         client = Mock()
 
@@ -119,7 +119,7 @@ class TestPowerCycle(MAASServerTestCase):
             ),
         )
 
-    def test__raises_power_problem(self):
+    def test_raises_power_problem(self):
         node = factory.make_Node()
         client = Mock()
         client.return_value = fail(
@@ -138,7 +138,7 @@ class TestPowerCycle(MAASServerTestCase):
 class TestPowerQuery(MAASServerTestCase):
     """Tests for `power_query`."""
 
-    def test__power_querys_single_node(self):
+    def test_power_querys_single_node(self):
         node = factory.make_Node()
         client = Mock()
 
@@ -165,7 +165,7 @@ class TestPowerQuery(MAASServerTestCase):
 class TestPowerDriverCheck(MAASServerTestCase):
     """Tests for `power_driver_check`."""
 
-    def test__handled(self):
+    def test_handled(self):
         node = factory.make_Node()
         power_info = node.get_effective_power_info()
         client = Mock()
@@ -191,7 +191,7 @@ class TestPowerQueryAll(MAASTransactionServerTestCase):
 
     @wait_for_reactor
     @inlineCallbacks
-    def test__calls_PowerQuery_on_all_clients(self):
+    def test_calls_PowerQuery_on_all_clients(self):
         node, power_info = yield deferToDatabase(
             self.make_node_with_power_info
         )
@@ -232,7 +232,7 @@ class TestPowerQueryAll(MAASTransactionServerTestCase):
 
     @wait_for_reactor
     @inlineCallbacks
-    def test__handles_timeout(self):
+    def test_handles_timeout(self):
         node, power_info = yield deferToDatabase(
             self.make_node_with_power_info
         )
diff --git a/src/maasserver/clusterrpc/tests/test_utils.py b/src/maasserver/clusterrpc/tests/test_utils.py
index 6769287..9fad892 100644
--- a/src/maasserver/clusterrpc/tests/test_utils.py
+++ b/src/maasserver/clusterrpc/tests/test_utils.py
@@ -42,7 +42,7 @@ class MockFailure(Failure):
 class TestCallClusters(MAASServerTestCase):
     """Tests for `utils.call_clusters`."""
 
-    def test__gets_clients(self):
+    def test_gets_clients(self):
         rack = factory.make_RackController()
         getClientFor = self.patch(utils, "getClientFor")
         getClientFor.return_value = lambda: None
@@ -55,7 +55,7 @@ class TestCallClusters(MAASServerTestCase):
         self.assertItemsEqual([], utils.call_clusters(sentinel.command))
         self.assertThat(getClientFor, MockCalledOnceWith(rack.system_id))
 
-    def test__with_successful_callbacks(self):
+    def test_with_successful_callbacks(self):
         rack = factory.make_RackController()
         getClientFor = self.patch(utils, "getClientFor")
         getClientFor.return_value = lambda: None
@@ -87,7 +87,7 @@ class TestCallClusters(MAASServerTestCase):
         self.assertThat(failed_callback, MockNotCalled())
         self.assertThat(timeout_callback, MockNotCalled())
 
-    def test__with_unavailable_callbacks(self):
+    def test_with_unavailable_callbacks(self):
         logger = self.useFixture(FakeLogger("maasserver"))
         rack = factory.make_RackController()
         getClientFor = self.patch(utils, "getClientFor")
@@ -121,7 +121,7 @@ class TestCallClusters(MAASServerTestCase):
             logger.output, DocTestMatches("...Unable to get RPC connection...")
         )
 
-    def test__with_failed_callbacks(self):
+    def test_with_failed_callbacks(self):
         logger = self.useFixture(FakeLogger("maasserver"))
         rack = factory.make_RackController()
         getClientFor = self.patch(utils, "getClientFor")
@@ -160,7 +160,7 @@ class TestCallClusters(MAASServerTestCase):
             ),
         )
 
-    def test__with_timeout_callbacks(self):
+    def test_with_timeout_callbacks(self):
         logger = self.useFixture(FakeLogger("maasserver"))
         rack = factory.make_RackController()
         getClientFor = self.patch(utils, "getClientFor")
@@ -198,7 +198,7 @@ class TestCallClusters(MAASServerTestCase):
 class TestCallRacksSynchronously(MAASServerTestCase):
     """Tests for `utils.call_rakcks_synchronously`."""
 
-    def test__gets_clients(self):
+    def test_gets_clients(self):
         rack = factory.make_RackController()
         getClientFor = self.patch(utils, "getClientFor")
         getClientFor.return_value = lambda: None
diff --git a/src/maasserver/dns/tests/test_config.py b/src/maasserver/dns/tests/test_config.py
index 3b5fc4f..3d955c7 100644
--- a/src/maasserver/dns/tests/test_config.py
+++ b/src/maasserver/dns/tests/test_config.py
@@ -464,15 +464,15 @@ class TestIPv6DNS(TestDNSServer):
 class TestGetUpstreamDNS(MAASServerTestCase):
     """Test for maasserver/dns/config.py:get_upstream_dns()"""
 
-    def test__returns_empty_list_if_not_set(self):
+    def test_returns_empty_list_if_not_set(self):
         self.assertEqual([], get_upstream_dns())
 
-    def test__returns_list_of_one_address_if_set(self):
+    def test_returns_list_of_one_address_if_set(self):
         address = factory.make_ip_address()
         Config.objects.set_config("upstream_dns", address)
         self.assertEqual([address], get_upstream_dns())
 
-    def test__returns_list_if_space_separated_ips(self):
+    def test_returns_list_if_space_separated_ips(self):
         addresses = [factory.make_ip_address() for _ in range(3)]
         Config.objects.set_config("upstream_dns", " ".join(addresses))
         self.assertEqual(addresses, get_upstream_dns())
@@ -485,16 +485,16 @@ class TestGetTrustedAcls(MAASServerTestCase):
         super(TestGetTrustedAcls, self).setUp()
         self.useFixture(RegionConfigurationFixture())
 
-    def test__returns_empty_string_if_no_networks(self):
+    def test_returns_empty_string_if_no_networks(self):
         self.assertEqual([], get_trusted_acls())
 
-    def test__returns_single_network(self):
+    def test_returns_single_network(self):
         subnet = factory.make_ipv6_network()
         Config.objects.set_config("dns_trusted_acl", str(subnet))
         expected = [str(subnet)]
         self.assertEqual(expected, get_trusted_acls())
 
-    def test__returns_many_networks(self):
+    def test_returns_many_networks(self):
         subnets = [
             str(factory.make_ipv4_network())
             for _ in range(random.randint(1, 5))
@@ -514,21 +514,21 @@ class TestGetTrustedNetworks(MAASServerTestCase):
         super(TestGetTrustedNetworks, self).setUp()
         self.useFixture(RegionConfigurationFixture())
 
-    def test__returns_empty_string_if_no_networks(self):
+    def test_returns_empty_string_if_no_networks(self):
         self.assertEqual([], get_trusted_networks())
 
-    def test__returns_single_network(self):
+    def test_returns_single_network(self):
         subnet = factory.make_Subnet()
         expected = [str(subnet.cidr)]
         self.assertEqual(expected, get_trusted_networks())
 
-    def test__returns_no_networks_if_not_allow_dns(self):
+    def test_returns_no_networks_if_not_allow_dns(self):
         factory.make_Subnet(allow_dns=False)
         subnet_allowed = factory.make_Subnet(allow_dns=True)
         expected = [str(subnet_allowed.cidr)]
         self.assertEqual(expected, get_trusted_networks())
 
-    def test__returns_many_networks(self):
+    def test_returns_many_networks(self):
         subnets = [factory.make_Subnet() for _ in range(random.randint(1, 5))]
         expected = [str(subnet.cidr) for subnet in subnets]
         # Note: This test was seen randomly failing because the networks were
@@ -539,13 +539,13 @@ class TestGetTrustedNetworks(MAASServerTestCase):
 class TestGetInternalDomain(MAASServerTestCase):
     """Test for maasserver/dns/config.py:get_internal_domain()"""
 
-    def test__uses_maas_internal_domain_config(self):
+    def test_uses_maas_internal_domain_config(self):
         internal_domain = factory.make_name("internal")
         Config.objects.set_config("maas_internal_domain", internal_domain)
         domain = get_internal_domain()
         self.assertEqual(internal_domain, domain.name)
 
-    def test__doesnt_add_disconnected_rack(self):
+    def test_doesnt_add_disconnected_rack(self):
         rack = factory.make_RackController()
         # No `RegionRackRPCConnection` is being created so the rack is
         # disconnected.
@@ -561,7 +561,7 @@ class TestGetInternalDomain(MAASServerTestCase):
         domain = get_internal_domain()
         self.assertEqual(0, len(domain.resources))
 
-    def test__adds_connected_rack_ipv4(self):
+    def test_adds_connected_rack_ipv4(self):
         rack = factory.make_RackController()
         factory.make_RegionRackRPCConnection(rack)
         nic = rack.get_boot_interface()
@@ -582,7 +582,7 @@ class TestGetInternalDomain(MAASServerTestCase):
             domain.resources[0].records[0],
         )
 
-    def test__adds_connected_rack_ipv6(self):
+    def test_adds_connected_rack_ipv6(self):
         rack = factory.make_RackController()
         factory.make_RegionRackRPCConnection(rack)
         nic = rack.get_boot_interface()
@@ -603,7 +603,7 @@ class TestGetInternalDomain(MAASServerTestCase):
             domain.resources[0].records[0],
         )
 
-    def test__adds_connected_multiple_racks_ipv4(self):
+    def test_adds_connected_multiple_racks_ipv4(self):
         rack1 = factory.make_RackController()
         factory.make_RegionRackRPCConnection(rack1)
         rack2 = factory.make_RackController()
@@ -642,7 +642,7 @@ class TestGetInternalDomain(MAASServerTestCase):
             ),
         )
 
-    def test__adds_connected_multiple_racks_ipv6(self):
+    def test_adds_connected_multiple_racks_ipv6(self):
         rack1 = factory.make_RackController()
         factory.make_RegionRackRPCConnection(rack1)
         rack2 = factory.make_RackController()
@@ -681,7 +681,7 @@ class TestGetInternalDomain(MAASServerTestCase):
             ),
         )
 
-    def test__prefers_static_ip_over_dhcp(self):
+    def test_prefers_static_ip_over_dhcp(self):
         rack = factory.make_RackController()
         factory.make_RegionRackRPCConnection(rack)
         nic = rack.get_boot_interface()
@@ -725,6 +725,6 @@ class TestGetResourceNameForSubnet(MAASServerTestCase):
         ),
     )
 
-    def test__returns_valid(self):
+    def test_returns_valid(self):
         subnet = factory.make_Subnet(cidr=self.cidr)
         self.assertEqual(self.result, get_resource_name_for_subnet(subnet))
diff --git a/src/maasserver/dns/tests/test_zonegenerator.py b/src/maasserver/dns/tests/test_zonegenerator.py
index 5655873..f47f7d1 100644
--- a/src/maasserver/dns/tests/test_zonegenerator.py
+++ b/src/maasserver/dns/tests/test_zonegenerator.py
@@ -168,7 +168,7 @@ class TestGetDNSServerAddresses(MAASServerTestCase):
 
 
 class TestGetDNSSearchPaths(MAASServerTestCase):
-    def test__returns_all_authoritative_domains(self):
+    def test_returns_all_authoritative_domains(self):
         domain_names = get_dns_search_paths()
         domain_names.update(
             factory.make_Domain(authoritative=True).name for _ in range(3)
diff --git a/src/maasserver/forms/tests/test_clone.py b/src/maasserver/forms/tests/test_clone.py
index 72cc26d..4d65d40 100644
--- a/src/maasserver/forms/tests/test_clone.py
+++ b/src/maasserver/forms/tests/test_clone.py
@@ -14,7 +14,7 @@ from maasserver.testing.testcase import MAASServerTestCase
 
 
 class TestCloneForm(MAASServerTestCase):
-    def test__empty_errors(self):
+    def test_empty_errors(self):
         user = factory.make_admin()
         form = CloneForm(user, data={})
         self.assertFalse(form.is_valid())
@@ -27,7 +27,7 @@ class TestCloneForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__source_destination_match_error(self):
+    def test_source_destination_match_error(self):
         user = factory.make_admin()
         source = factory.make_Machine(
             status=random.choice(
@@ -53,7 +53,7 @@ class TestCloneForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__source_destination_smaller_storage(self):
+    def test_source_destination_smaller_storage(self):
         user = factory.make_admin()
         source = factory.make_Machine(with_boot_disk=False)
         factory.make_PhysicalBlockDevice(
@@ -88,7 +88,7 @@ class TestCloneForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__source_destination_missing_nic(self):
+    def test_source_destination_missing_nic(self):
         user = factory.make_admin()
         source = factory.make_Machine(with_boot_disk=False)
         factory.make_Interface(node=source, name="eth0")
@@ -119,7 +119,7 @@ class TestCloneForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__permission_errors(self):
+    def test_permission_errors(self):
         user = factory.make_User()
         source = factory.make_Machine(with_boot_disk=False)
         factory.make_PhysicalBlockDevice(
@@ -157,7 +157,7 @@ class TestCloneForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__performs_clone(self):
+    def test_performs_clone(self):
         user = factory.make_admin()
         source = factory.make_Machine(with_boot_disk=False)
         factory.make_PhysicalBlockDevice(
diff --git a/src/maasserver/forms/tests/test_controller.py b/src/maasserver/forms/tests/test_controller.py
index 6300d60..1b892bf 100644
--- a/src/maasserver/forms/tests/test_controller.py
+++ b/src/maasserver/forms/tests/test_controller.py
@@ -26,19 +26,19 @@ class TestControllerForm(MAASServerTestCase):
             list(form.fields),
         )
 
-    def test___populates_power_type_choices(self):
+    def test_populates_power_type_choices(self):
         form = ControllerForm()
         self.assertEqual(
             [""] + [choice[0] for choice in get_driver_choices()],
             [choice[0] for choice in form.fields["power_type"].choices],
         )
 
-    def test___populates_power_type_initial(self):
+    def test_populates_power_type_initial(self):
         rack = factory.make_RackController()
         form = ControllerForm(instance=rack)
         self.assertEqual(rack.power_type, form.fields["power_type"].initial)
 
-    def test__sets_power_type(self):
+    def test_sets_power_type(self):
         rack = factory.make_RackController()
         power_type = factory.pick_power_type()
         form = ControllerForm(
@@ -51,7 +51,7 @@ class TestControllerForm(MAASServerTestCase):
         rack = form.save()
         self.assertEqual(power_type, rack.power_type)
 
-    def test__sets_power_parameters(self):
+    def test_sets_power_parameters(self):
         rack = factory.make_RackController()
         power_parameters_field = factory.make_string()
         form = ControllerForm(
@@ -66,7 +66,7 @@ class TestControllerForm(MAASServerTestCase):
             power_parameters_field, rack.power_parameters["field"]
         )
 
-    def test__sets_zone(self):
+    def test_sets_zone(self):
         rack = factory.make_RackController()
         zone = factory.make_zone()
         form = ControllerForm(
@@ -76,7 +76,7 @@ class TestControllerForm(MAASServerTestCase):
         rack = form.save()
         self.assertEqual(zone.name, rack.zone.name)
 
-    def test__sets_domain(self):
+    def test_sets_domain(self):
         rack = factory.make_RackController()
         domain = factory.make_Domain()
         form = ControllerForm(
diff --git a/src/maasserver/forms/tests/test_dhcpsnippet.py b/src/maasserver/forms/tests/test_dhcpsnippet.py
index 07082ca..62408ed 100644
--- a/src/maasserver/forms/tests/test_dhcpsnippet.py
+++ b/src/maasserver/forms/tests/test_dhcpsnippet.py
@@ -24,17 +24,17 @@ class TestDHCPSnippetForm(MAASServerTestCase):
         super().setUp()
         self.patch(dhcpsnippet, "validate_dhcp_config").return_value = {}
 
-    def test__create_dhcp_snippet_requies_name(self):
+    def test_create_dhcp_snippet_requies_name(self):
         form = DHCPSnippetForm(data={"value": factory.make_string()})
         self.assertFalse(form.is_valid())
         self.assertItemsEqual([], VersionedTextFile.objects.all())
 
-    def test__create_dhcp_snippet_requires_value(self):
+    def test_create_dhcp_snippet_requires_value(self):
         form = DHCPSnippetForm(data={"name": factory.make_name("name")})
         self.assertFalse(form.is_valid())
         self.assertItemsEqual([], VersionedTextFile.objects.all())
 
-    def test__creates_dhcp_snippet(self):
+    def test_creates_dhcp_snippet(self):
         name = factory.make_name("name")
         value = factory.make_string()
         description = factory.make_string()
@@ -62,7 +62,7 @@ class TestDHCPSnippetForm(MAASServerTestCase):
             event.description, "Created DHCP snippet '%s'." % dhcp_snippet.name
         )
 
-    def test__create_dhcp_snippet_defaults_to_enabled(self):
+    def test_create_dhcp_snippet_defaults_to_enabled(self):
         name = factory.make_name("name")
         value = factory.make_string()
         description = factory.make_string()
@@ -79,7 +79,7 @@ class TestDHCPSnippetForm(MAASServerTestCase):
         self.assertEqual(description, dhcp_snippet.description)
         self.assertTrue(dhcp_snippet.enabled)
 
-    def test__creates_dhcp_snippet_with_node(self):
+    def test_creates_dhcp_snippet_with_node(self):
         node = factory.make_Node()
         name = factory.make_name("name")
         value = factory.make_string()
@@ -104,7 +104,7 @@ class TestDHCPSnippetForm(MAASServerTestCase):
         self.assertEqual(enabled, dhcp_snippet.enabled)
         self.assertEqual(node, dhcp_snippet.node)
 
-    def test__creates_dhcp_snippet_with_subnet(self):
+    def test_creates_dhcp_snippet_with_subnet(self):
         subnet = factory.make_Subnet()
         name = factory.make_name("name")
         value = factory.make_string()
@@ -130,7 +130,7 @@ class TestDHCPSnippetForm(MAASServerTestCase):
         self.assertEqual(enabled, dhcp_snippet.enabled)
         self.assertEqual(subnet, dhcp_snippet.subnet)
 
-    def test__cannt_create_dhcp_snippet_with_node_and_subnet(self):
+    def test_cannt_create_dhcp_snippet_with_node_and_subnet(self):
         node = factory.make_Node()
         subnet = factory.make_Subnet()
         name = factory.make_name("name")
@@ -149,7 +149,7 @@ class TestDHCPSnippetForm(MAASServerTestCase):
         )
         self.assertFalse(form.is_valid())
 
-    def test__fail_validation_on_create_cleans_value(self):
+    def test_fail_validation_on_create_cleans_value(self):
         node = factory.make_Node()
         subnet = factory.make_Subnet()
         name = factory.make_name("name")
@@ -170,7 +170,7 @@ class TestDHCPSnippetForm(MAASServerTestCase):
         self.assertItemsEqual([], DHCPSnippet.objects.all())
         self.assertItemsEqual([], VersionedTextFile.objects.all())
 
-    def test__updates_name(self):
+    def test_updates_name(self):
         dhcp_snippet = factory.make_DHCPSnippet()
         name = factory.make_name("name")
         form = DHCPSnippetForm(instance=dhcp_snippet, data={"name": name})
@@ -186,7 +186,7 @@ class TestDHCPSnippetForm(MAASServerTestCase):
             event.description, "Updated DHCP snippet '%s'." % dhcp_snippet.name
         )
 
-    def test__updates_value(self):
+    def test_updates_value(self):
         dhcp_snippet = factory.make_DHCPSnippet()
         old_value = dhcp_snippet.value.data
         new_value = factory.make_string()
@@ -201,7 +201,7 @@ class TestDHCPSnippetForm(MAASServerTestCase):
         self.assertEqual(new_value, dhcp_snippet.value.data)
         self.assertEqual(old_value, dhcp_snippet.value.previous_version.data)
 
-    def test__updates_description(self):
+    def test_updates_description(self):
         dhcp_snippet = factory.make_DHCPSnippet()
         description = factory.make_string()
         form = DHCPSnippetForm(
@@ -214,7 +214,7 @@ class TestDHCPSnippetForm(MAASServerTestCase):
         dhcp_snippet = form.save(endpoint, request)
         self.assertEqual(description, dhcp_snippet.description)
 
-    def test__updates_enabled(self):
+    def test_updates_enabled(self):
         dhcp_snippet = factory.make_DHCPSnippet()
         enabled = not dhcp_snippet.enabled
         form = DHCPSnippetForm(
@@ -227,7 +227,7 @@ class TestDHCPSnippetForm(MAASServerTestCase):
         dhcp_snippet = form.save(endpoint, request)
         self.assertEqual(enabled, dhcp_snippet.enabled)
 
-    def test__updates_node(self):
+    def test_updates_node(self):
         dhcp_snippet = factory.make_DHCPSnippet()
         node = factory.make_Node()
         form = DHCPSnippetForm(
@@ -240,7 +240,7 @@ class TestDHCPSnippetForm(MAASServerTestCase):
         dhcp_snippet = form.save(endpoint, request)
         self.assertEqual(node, dhcp_snippet.node)
 
-    def test__updates_node_when_subnet_set(self):
+    def test_updates_node_when_subnet_set(self):
         dhcp_snippet = factory.make_DHCPSnippet(subnet=factory.make_Subnet())
         node = factory.make_Node()
         form = DHCPSnippetForm(
@@ -254,7 +254,7 @@ class TestDHCPSnippetForm(MAASServerTestCase):
         self.assertIsNone(dhcp_snippet.subnet)
         self.assertEquals(node, dhcp_snippet.node)
 
-    def test__updates_subnet(self):
+    def test_updates_subnet(self):
         dhcp_snippet = factory.make_DHCPSnippet()
         subnet = factory.make_Subnet()
         form = DHCPSnippetForm(
@@ -267,7 +267,7 @@ class TestDHCPSnippetForm(MAASServerTestCase):
         dhcp_snippet = form.save(endpoint, request)
         self.assertEqual(subnet, dhcp_snippet.subnet)
 
-    def test__updates_subnet_when_node_set(self):
+    def test_updates_subnet_when_node_set(self):
         dhcp_snippet = factory.make_DHCPSnippet(node=factory.make_Node())
         subnet = factory.make_Subnet()
         form = DHCPSnippetForm(
@@ -281,7 +281,7 @@ class TestDHCPSnippetForm(MAASServerTestCase):
         self.assertIsNone(dhcp_snippet.node)
         self.assertEquals(subnet, dhcp_snippet.subnet)
 
-    def test__cannot_update_both_node_and_subnet(self):
+    def test_cannot_update_both_node_and_subnet(self):
         dhcp_snippet = factory.make_DHCPSnippet()
         form = DHCPSnippetForm(
             instance=dhcp_snippet,
@@ -292,7 +292,7 @@ class TestDHCPSnippetForm(MAASServerTestCase):
         )
         self.assertFalse(form.is_valid())
 
-    def test__update_failure_doesnt_delete_value(self):
+    def test_update_failure_doesnt_delete_value(self):
         dhcp_snippet = factory.make_DHCPSnippet()
         value = dhcp_snippet.value.data
         form = DHCPSnippetForm(
@@ -305,7 +305,7 @@ class TestDHCPSnippetForm(MAASServerTestCase):
         self.assertFalse(form.is_valid())
         self.assertEquals(value, reload_object(dhcp_snippet).value.data)
 
-    def test__update_global_snippet_resets_node(self):
+    def test_update_global_snippet_resets_node(self):
         node = factory.make_Node()
         dhcp_snippet = factory.make_DHCPSnippet(node=node)
         form = DHCPSnippetForm(
@@ -318,7 +318,7 @@ class TestDHCPSnippetForm(MAASServerTestCase):
         dhcp_snippet = form.save(endpoint, request)
         self.assertIsNone(dhcp_snippet.node)
 
-    def test__update_global_snippet_resets_subnet(self):
+    def test_update_global_snippet_resets_subnet(self):
         subnet = factory.make_Subnet()
         dhcp_snippet = factory.make_DHCPSnippet(subnet=subnet)
         form = DHCPSnippetForm(
diff --git a/src/maasserver/forms/tests/test_dnsdata.py b/src/maasserver/forms/tests/test_dnsdata.py
index 8b7d553..71c838e 100644
--- a/src/maasserver/forms/tests/test_dnsdata.py
+++ b/src/maasserver/forms/tests/test_dnsdata.py
@@ -14,7 +14,7 @@ from maasserver.utils.orm import reload_object
 
 
 class TestDNSDataForm(MAASServerTestCase):
-    def test__creates_dnsdata(self):
+    def test_creates_dnsdata(self):
         name = factory.make_name("dnsdata")
         (rrtype, rrdata) = factory.pick_rrset()
         dnsrr = factory.make_DNSResource(no_ip_addresses=True)
@@ -77,12 +77,12 @@ class TestDNSDataForm(MAASServerTestCase):
         self.assertEqual(rrdata, dnsdata.rrdata)
         self.assertEqual(None, dnsdata.ttl)
 
-    def test__doesnt_require_name_on_update(self):
+    def test_doesnt_require_name_on_update(self):
         dnsdata = factory.make_DNSData()
         form = DNSDataForm(instance=dnsdata, data={})
         self.assertTrue(form.is_valid(), form.errors)
 
-    def test__updates_dnsdata(self):
+    def test_updates_dnsdata(self):
         dnsdata = factory.make_DNSData()
         (rrtype, rrdata) = factory.pick_rrset()
         new_ttl = random.randint(1, 1000)
diff --git a/src/maasserver/forms/tests/test_dnsresource.py b/src/maasserver/forms/tests/test_dnsresource.py
index 130c676..f7a5d1b 100644
--- a/src/maasserver/forms/tests/test_dnsresource.py
+++ b/src/maasserver/forms/tests/test_dnsresource.py
@@ -15,7 +15,7 @@ from maasserver.utils.orm import reload_object
 
 
 class TestDNSResourceForm(MAASServerTestCase):
-    def test__creates_dnsresource(self):
+    def test_creates_dnsresource(self):
         name = factory.make_name("dnsresource")
         sip = factory.make_StaticIPAddress()
         domain = factory.make_Domain()
@@ -31,7 +31,7 @@ class TestDNSResourceForm(MAASServerTestCase):
         self.assertEqual(domain.id, dnsresource.domain.id)
         self.assertEqual(sip.id, dnsresource.ip_addresses.first().id)
 
-    def test__accepts_string_for_ip_addresses(self):
+    def test_accepts_string_for_ip_addresses(self):
         name = factory.make_name("dnsresource")
         sip = factory.make_StaticIPAddress()
         domain = factory.make_Domain()
@@ -44,7 +44,7 @@ class TestDNSResourceForm(MAASServerTestCase):
         self.assertEqual(domain.id, dnsresource.domain.id)
         self.assertEqual(sip.id, dnsresource.ip_addresses.first().id)
 
-    def test__creates_staticipaddresses(self):
+    def test_creates_staticipaddresses(self):
         name = factory.make_name("dnsresource")
         domain = factory.make_Domain()
         ips = [factory.make_ip_address() for _ in range(3)]
@@ -64,7 +64,7 @@ class TestDNSResourceForm(MAASServerTestCase):
         actual_users = {ip.user_id for ip in actual_ips}
         self.assertItemsEqual({request.user.id}, actual_users)
 
-    def test__accepts_mix_of_id_and_ipaddress(self):
+    def test_accepts_mix_of_id_and_ipaddress(self):
         name = factory.make_name("dnsresource")
         domain = factory.make_Domain()
         ips = [factory.make_StaticIPAddress() for _ in range(6)]
@@ -125,12 +125,12 @@ class TestDNSResourceForm(MAASServerTestCase):
         self.assertEqual(domain.id, dnsresource.domain.id)
         self.assertEqual(None, dnsresource.address_ttl)
 
-    def test__doesnt_require_name_on_update(self):
+    def test_doesnt_require_name_on_update(self):
         dnsresource = factory.make_DNSResource()
         form = DNSResourceForm(instance=dnsresource, data={})
         self.assertTrue(form.is_valid(), form.errors)
 
-    def test__updates_dnsresource(self):
+    def test_updates_dnsresource(self):
         dnsresource = factory.make_DNSResource()
         new_name = factory.make_name("new")
         new_sip_ids = [factory.make_StaticIPAddress().id]
@@ -152,7 +152,7 @@ class TestDNSResourceForm(MAASServerTestCase):
             [ip.id for ip in reload_object(dnsresource).ip_addresses.all()],
         )
 
-    def test__update_allows_multiple_ips(self):
+    def test_update_allows_multiple_ips(self):
         dnsresource = factory.make_DNSResource()
         new_name = factory.make_name("new")
         new_sip_ids = [factory.make_StaticIPAddress().id for _ in range(3)]
diff --git a/src/maasserver/forms/tests/test_domain.py b/src/maasserver/forms/tests/test_domain.py
index 94d78f4..1b74300 100644
--- a/src/maasserver/forms/tests/test_domain.py
+++ b/src/maasserver/forms/tests/test_domain.py
@@ -14,7 +14,7 @@ from maasserver.utils.orm import reload_object
 
 
 class TestDomainForm(MAASServerTestCase):
-    def test__creates_domain(self):
+    def test_creates_domain(self):
         domain_name = factory.make_name("domain")
         domain_authoritative = factory.pick_bool()
         ttl = random.randint(1, 604800)
@@ -31,12 +31,12 @@ class TestDomainForm(MAASServerTestCase):
         self.assertEqual(domain_authoritative, domain.authoritative)
         self.assertEqual(ttl, domain.ttl)
 
-    def test__doest_require_name_on_update(self):
+    def test_doest_require_name_on_update(self):
         domain = factory.make_Domain()
         form = DomainForm(instance=domain, data={})
         self.assertTrue(form.is_valid(), form.errors)
 
-    def test__updates_domain(self):
+    def test_updates_domain(self):
         new_name = factory.make_name("domain")
         old_authoritative = factory.pick_bool()
         domain = factory.make_Domain(authoritative=old_authoritative)
diff --git a/src/maasserver/forms/tests/test_ephemeral.py b/src/maasserver/forms/tests/test_ephemeral.py
index 61fe11b..0bf95cd 100644
--- a/src/maasserver/forms/tests/test_ephemeral.py
+++ b/src/maasserver/forms/tests/test_ephemeral.py
@@ -21,13 +21,13 @@ from metadataserver.enum import SCRIPT_TYPE
 
 
 class TestTestForm(MAASServerTestCase):
-    def test__doesnt_require_anything(self):
+    def test_doesnt_require_anything(self):
         node = factory.make_Node(status=NODE_STATUS.DEPLOYED)
         user = factory.make_admin()
         form = TestForm(instance=node, user=user, data={})
         self.assertTrue(form.is_valid(), form.errors)
 
-    def test__not_allowed_in_bad_state(self):
+    def test_not_allowed_in_bad_state(self):
         node = factory.make_Node(status=NODE_STATUS.DEPLOYING)
         user = factory.make_admin()
         form = TestForm(instance=node, user=user, data={})
@@ -42,7 +42,7 @@ class TestTestForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__calls_start_testing_if_already_on(self):
+    def test_calls_start_testing_if_already_on(self):
         node = factory.make_Node(
             status=NODE_STATUS.DEPLOYED, power_state=POWER_STATE.ON
         )
@@ -55,7 +55,7 @@ class TestTestForm(MAASServerTestCase):
             mock_start_testing, MockCalledOnceWith(user, False, [], {})
         )
 
-    def test__calls_start_testing_with_options(self):
+    def test_calls_start_testing_with_options(self):
         node = factory.make_Node(status=NODE_STATUS.DEPLOYED)
         user = factory.make_admin()
         enable_ssh = factory.pick_bool()
@@ -80,7 +80,7 @@ class TestTestForm(MAASServerTestCase):
             MockCalledOnceWith(user, enable_ssh, testing_scripts, {}),
         )
 
-    def test__class_start_testing_with_storage_param(self):
+    def test_class_start_testing_with_storage_param(self):
         node = factory.make_Node(
             status=NODE_STATUS.DEPLOYED, with_boot_disk=False
         )
@@ -116,7 +116,7 @@ class TestTestForm(MAASServerTestCase):
             ),
         )
 
-    def test__class_start_testing_with_storage_param_errors(self):
+    def test_class_start_testing_with_storage_param_errors(self):
         node = factory.make_Node(status=NODE_STATUS.DEPLOYED)
         user = factory.make_admin()
         script = factory.make_Script(
@@ -134,7 +134,7 @@ class TestTestForm(MAASServerTestCase):
         )
         self.assertFalse(form.is_valid())
 
-    def test__class_start_testing_with_interface_param(self):
+    def test_class_start_testing_with_interface_param(self):
         node = factory.make_Node(status=NODE_STATUS.DEPLOYED, interface=False)
         interface = factory.make_Interface(node=node)
         user = factory.make_admin()
@@ -169,7 +169,7 @@ class TestTestForm(MAASServerTestCase):
             ),
         )
 
-    def test__class_start_testing_with_interface_param_errors(self):
+    def test_class_start_testing_with_interface_param_errors(self):
         node = factory.make_Node(status=NODE_STATUS.DEPLOYED)
         user = factory.make_admin()
         script = factory.make_Script(
@@ -187,7 +187,7 @@ class TestTestForm(MAASServerTestCase):
         )
         self.assertFalse(form.is_valid())
 
-    def test__class_start_testing_with_runtime_param(self):
+    def test_class_start_testing_with_runtime_param(self):
         node = factory.make_Node(status=NODE_STATUS.DEPLOYED)
         user = factory.make_admin()
         script = factory.make_Script(
@@ -211,7 +211,7 @@ class TestTestForm(MAASServerTestCase):
             ),
         )
 
-    def test__class_start_testing_with_runtime_param_errors(self):
+    def test_class_start_testing_with_runtime_param_errors(self):
         node = factory.make_Node(status=NODE_STATUS.DEPLOYED)
         user = factory.make_admin()
         script = factory.make_Script(
@@ -229,7 +229,7 @@ class TestTestForm(MAASServerTestCase):
         )
         self.assertFalse(form.is_valid())
 
-    def test__class_start_testing_with_url_param(self):
+    def test_class_start_testing_with_url_param(self):
         node = factory.make_Node(status=NODE_STATUS.DEPLOYED)
         user = factory.make_admin()
         script = factory.make_Script(
@@ -253,7 +253,7 @@ class TestTestForm(MAASServerTestCase):
             ),
         )
 
-    def test__class_start_testing_can_override_global_param(self):
+    def test_class_start_testing_can_override_global_param(self):
         node = factory.make_Node(status=NODE_STATUS.DEPLOYED)
         bd = factory.make_PhysicalBlockDevice(node=node)
         user = factory.make_admin()
@@ -301,7 +301,7 @@ class TestTestForm(MAASServerTestCase):
             ),
         )
 
-    def test__validates_testing_scripts(self):
+    def test_validates_testing_scripts(self):
         node = factory.make_Node(status=NODE_STATUS.DEPLOYED)
         user = factory.make_admin()
         form = TestForm(
@@ -311,7 +311,7 @@ class TestTestForm(MAASServerTestCase):
         )
         self.assertFalse(form.is_valid())
 
-    def test__testing_scripts_cannt_be_none(self):
+    def test_testing_scripts_cannt_be_none(self):
         node = factory.make_Node(status=NODE_STATUS.DEPLOYED)
         user = factory.make_admin()
         form = TestForm(
@@ -319,7 +319,7 @@ class TestTestForm(MAASServerTestCase):
         )
         self.assertFalse(form.is_valid())
 
-    def test__cannt_run_destructive_test_on_deployed_machine(self):
+    def test_cannt_run_destructive_test_on_deployed_machine(self):
         script = factory.make_Script(
             script_type=SCRIPT_TYPE.TESTING, destructive=True
         )
@@ -330,7 +330,7 @@ class TestTestForm(MAASServerTestCase):
         )
         self.assertFalse(form.is_valid())
 
-    def test__cannt_run_destructive_test_on_non_machine(self):
+    def test_cannt_run_destructive_test_on_non_machine(self):
         script = factory.make_Script(
             script_type=SCRIPT_TYPE.TESTING, destructive=True
         )
@@ -347,7 +347,7 @@ class TestTestForm(MAASServerTestCase):
 
 
 class TestCommissionForm(MAASServerTestCase):
-    def test__doesnt_require_anything(self):
+    def test_doesnt_require_anything(self):
         node = factory.make_Node(
             status=NODE_STATUS.READY, power_state=POWER_STATE.OFF
         )
@@ -355,7 +355,7 @@ class TestCommissionForm(MAASServerTestCase):
         form = CommissionForm(instance=node, user=user, data={})
         self.assertTrue(form.is_valid(), form.errors)
 
-    def test__not_allowed_in_bad_state(self):
+    def test_not_allowed_in_bad_state(self):
         node = factory.make_Node(
             status=NODE_STATUS.DEPLOYING, power_state=POWER_STATE.OFF
         )
@@ -372,7 +372,7 @@ class TestCommissionForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__calls_start_commissioning_if_already_on(self):
+    def test_calls_start_commissioning_if_already_on(self):
         node = factory.make_Node(
             status=NODE_STATUS.READY, power_state=POWER_STATE.ON
         )
@@ -397,7 +397,7 @@ class TestCommissionForm(MAASServerTestCase):
             ),
         )
 
-    def test__calls_start_commissioning_with_options(self):
+    def test_calls_start_commissioning_with_options(self):
         node = factory.make_Node(
             status=NODE_STATUS.READY, power_state=POWER_STATE.OFF
         )
@@ -442,7 +442,7 @@ class TestCommissionForm(MAASServerTestCase):
             ),
         )
 
-    def test__class_start_commissioning_with_storage_param(self):
+    def test_class_start_commissioning_with_storage_param(self):
         node = factory.make_Node(
             status=NODE_STATUS.READY, with_boot_disk=False
         )
@@ -512,7 +512,7 @@ class TestCommissionForm(MAASServerTestCase):
             ),
         )
 
-    def test__class_start_commissioning_with_storage_param_errors(self):
+    def test_class_start_commissioning_with_storage_param_errors(self):
         node = factory.make_Node(status=NODE_STATUS.READY)
         user = factory.make_admin()
         commissioning_script = factory.make_Script(
@@ -537,7 +537,7 @@ class TestCommissionForm(MAASServerTestCase):
         )
         self.assertFalse(form.is_valid())
 
-    def test__class_start_commissioning_with_interface_param(self):
+    def test_class_start_commissioning_with_interface_param(self):
         node = factory.make_Node(status=NODE_STATUS.READY, interface=False)
         commissioning_interface = factory.make_Interface(node=node)
         testing_interface = factory.make_Interface(node=node)
@@ -613,7 +613,7 @@ class TestCommissionForm(MAASServerTestCase):
             ),
         )
 
-    def test__class_start_commissioning_with_interface_param_errors(self):
+    def test_class_start_commissioning_with_interface_param_errors(self):
         node = factory.make_Node(status=NODE_STATUS.DEPLOYED)
         user = factory.make_admin()
         commissioning_script = factory.make_Script(
@@ -638,7 +638,7 @@ class TestCommissionForm(MAASServerTestCase):
         )
         self.assertFalse(form.is_valid())
 
-    def test__class_start_commissioning_with_runtime_param(self):
+    def test_class_start_commissioning_with_runtime_param(self):
         node = factory.make_Node(status=NODE_STATUS.READY)
         user = factory.make_admin()
         commissioning_script = factory.make_Script(
@@ -684,7 +684,7 @@ class TestCommissionForm(MAASServerTestCase):
             ),
         )
 
-    def test__class_start_commissioning_with_runtime_param_errors(self):
+    def test_class_start_commissioning_with_runtime_param_errors(self):
         node = factory.make_Node(status=NODE_STATUS.READY)
         user = factory.make_admin()
         commissioning_script = factory.make_Script(
@@ -709,7 +709,7 @@ class TestCommissionForm(MAASServerTestCase):
         )
         self.assertFalse(form.is_valid())
 
-    def test__class_start_commissioning_with_url_param(self):
+    def test_class_start_commissioning_with_url_param(self):
         node = factory.make_Node(status=NODE_STATUS.READY)
         user = factory.make_admin()
         commissioning_script = factory.make_Script(
@@ -755,7 +755,7 @@ class TestCommissionForm(MAASServerTestCase):
             ),
         )
 
-    def test__class_start_commissioning_can_override_global_param(self):
+    def test_class_start_commissioning_can_override_global_param(self):
         node = factory.make_Node(status=NODE_STATUS.READY)
         commissioning_bd = factory.make_PhysicalBlockDevice(node=node)
         testing_bd = factory.make_PhysicalBlockDevice(node=node)
@@ -839,7 +839,7 @@ class TestCommissionForm(MAASServerTestCase):
             ),
         )
 
-    def test__validates_commissioning_scripts(self):
+    def test_validates_commissioning_scripts(self):
         node = factory.make_Node(
             status=NODE_STATUS.READY, power_state=POWER_STATE.OFF
         )
@@ -851,7 +851,7 @@ class TestCommissionForm(MAASServerTestCase):
         )
         self.assertFalse(form.is_valid())
 
-    def test__validates_testing_scripts(self):
+    def test_validates_testing_scripts(self):
         node = factory.make_Node(
             status=NODE_STATUS.READY, power_state=POWER_STATE.OFF
         )
@@ -863,7 +863,7 @@ class TestCommissionForm(MAASServerTestCase):
         )
         self.assertFalse(form.is_valid())
 
-    def test__allows_setting_testing_scripts_to_none(self):
+    def test_allows_setting_testing_scripts_to_none(self):
         node = factory.make_Node(
             status=NODE_STATUS.READY, power_state=POWER_STATE.OFF
         )
diff --git a/src/maasserver/forms/tests/test_fabric.py b/src/maasserver/forms/tests/test_fabric.py
index 1f5ffaa..ea54b06 100644
--- a/src/maasserver/forms/tests/test_fabric.py
+++ b/src/maasserver/forms/tests/test_fabric.py
@@ -12,7 +12,7 @@ from maasserver.utils.orm import reload_object
 
 
 class TestFabricForm(MAASServerTestCase):
-    def test__creates_fabric(self):
+    def test_creates_fabric(self):
         fabric_name = factory.make_name("fabric")
         fabric_description = factory.make_name("description")
         fabric_class_type = factory.make_name("class_type")
@@ -29,12 +29,12 @@ class TestFabricForm(MAASServerTestCase):
         self.assertEqual(fabric_description, fabric.description)
         self.assertEqual(fabric_class_type, fabric.class_type)
 
-    def test__doest_require_name_on_update(self):
+    def test_doest_require_name_on_update(self):
         fabric = factory.make_Fabric()
         form = FabricForm(instance=fabric, data={})
         self.assertTrue(form.is_valid(), form.errors)
 
-    def test__updates_fabric(self):
+    def test_updates_fabric(self):
         new_name = factory.make_name("fabric")
         new_fabric_description = factory.make_name("description")
         new_class_type = factory.make_name("class_type")
diff --git a/src/maasserver/forms/tests/test_fannetwork.py b/src/maasserver/forms/tests/test_fannetwork.py
index db4376d..22bcfe3 100644
--- a/src/maasserver/forms/tests/test_fannetwork.py
+++ b/src/maasserver/forms/tests/test_fannetwork.py
@@ -14,7 +14,7 @@ from maasserver.utils.orm import reload_object
 
 
 class TestFanNetworkForm(MAASServerTestCase):
-    def test__requires_name(self):
+    def test_requires_name(self):
         slash = random.randint(12, 28)
         underlay = factory.make_ipv4_network(slash=slash)
         overlay = factory.make_ipv4_network(slash=slash - 4)
@@ -24,7 +24,7 @@ class TestFanNetworkForm(MAASServerTestCase):
         self.assertFalse(form.is_valid(), form.errors)
         self.assertEqual({"name": ["This field is required."]}, form.errors)
 
-    def test__requires_overlay(self):
+    def test_requires_overlay(self):
         slash = random.randint(12, 28)
         underlay = factory.make_ipv4_network(slash=slash)
         form = FanNetworkForm(
@@ -36,7 +36,7 @@ class TestFanNetworkForm(MAASServerTestCase):
         self.assertFalse(form.is_valid(), form.errors)
         self.assertEqual({"overlay": ["This field is required."]}, form.errors)
 
-    def test__requires_underlay(self):
+    def test_requires_underlay(self):
         slash = random.randint(12, 28)
         overlay = factory.make_ipv4_network(slash=slash - 4)
         form = FanNetworkForm(
@@ -47,7 +47,7 @@ class TestFanNetworkForm(MAASServerTestCase):
             {"underlay": ["This field is required."]}, form.errors
         )
 
-    def test__creates_fannetwork(self):
+    def test_creates_fannetwork(self):
         fannetwork_name = factory.make_name("fannetwork")
         slash = random.randint(12, 28)
         underlay = factory.make_ipv4_network(slash=slash)
@@ -63,12 +63,12 @@ class TestFanNetworkForm(MAASServerTestCase):
         fannetwork = form.save()
         self.assertEqual(fannetwork_name, fannetwork.name)
 
-    def test__doest_require_name_on_update(self):
+    def test_doest_require_name_on_update(self):
         fannetwork = factory.make_FanNetwork()
         form = FanNetworkForm(instance=fannetwork, data={})
         self.assertTrue(form.is_valid(), form.errors)
 
-    def test__updates_fannetwork(self):
+    def test_updates_fannetwork(self):
         new_name = factory.make_name("fannetwork")
         fannetwork = factory.make_FanNetwork()
         form = FanNetworkForm(instance=fannetwork, data={"name": new_name})
diff --git a/src/maasserver/forms/tests/test_interface.py b/src/maasserver/forms/tests/test_interface.py
index 17159da..9a223f2 100644
--- a/src/maasserver/forms/tests/test_interface.py
+++ b/src/maasserver/forms/tests/test_interface.py
@@ -63,7 +63,7 @@ class ControllerInterfaceFormTest(MAASServerTestCase):
         ("region_rack", {"maker": factory.make_RegionRackController}),
     )
 
-    def test__edits_interface(self):
+    def test_edits_interface(self):
         node = self.maker()
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node)
         new_vlan = factory.make_VLAN(vid=33)
@@ -79,7 +79,7 @@ class ControllerInterfaceFormTest(MAASServerTestCase):
             ),
         )
 
-    def test__allows_no_vlan(self):
+    def test_allows_no_vlan(self):
         node = self.maker()
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node)
         form = ControllerInterfaceForm(instance=interface, data={"vlan": None})
@@ -92,7 +92,7 @@ class ControllerInterfaceFormTest(MAASServerTestCase):
             ),
         )
 
-    def test__updates_interface_links(self):
+    def test_updates_interface_links(self):
         interface = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, name="eth0", link_connected=False
         )
@@ -116,7 +116,7 @@ class ControllerInterfaceFormTest(MAASServerTestCase):
             ),
         )
 
-    def test__updates_interface_errors_for_not_link_connected_and_speed(self):
+    def test_updates_interface_errors_for_not_link_connected_and_speed(self):
         interface = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, name="eth0", link_connected=False
         )
@@ -134,7 +134,7 @@ class ControllerInterfaceFormTest(MAASServerTestCase):
 
 
 class DeployedInterfaceFormTest(MAASServerTestCase):
-    def test__updates_interface(self):
+    def test_updates_interface(self):
         interface = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, name="eth0", link_connected=False
         )
@@ -166,7 +166,7 @@ class DeployedInterfaceFormTest(MAASServerTestCase):
             ),
         )
 
-    def test__updates_interface_errors_for_not_link_connected_and_speed(self):
+    def test_updates_interface_errors_for_not_link_connected_and_speed(self):
         interface = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, name="eth0", link_connected=False
         )
@@ -189,7 +189,7 @@ class DeployedInterfaceFormTest(MAASServerTestCase):
 
 
 class TestPhysicalInterfaceForm(MAASServerTestCase):
-    def test__updates_interface(self):
+    def test_updates_interface(self):
         interface = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, name="eth0", link_connected=False
         )
@@ -225,7 +225,7 @@ class TestPhysicalInterfaceForm(MAASServerTestCase):
             ),
         )
 
-    def test__updates_interface_errors_for_not_link_connected_and_speed(self):
+    def test_updates_interface_errors_for_not_link_connected_and_speed(self):
         interface = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, name="eth0", link_connected=False
         )
@@ -246,7 +246,7 @@ class TestPhysicalInterfaceForm(MAASServerTestCase):
             form.errors["__all__"][0],
         )
 
-    def test__creates_physical_interface(self):
+    def test_creates_physical_interface(self):
         node = factory.make_Node()
         mac_address = factory.make_mac_address()
         interface_name = "eth0"
@@ -276,7 +276,7 @@ class TestPhysicalInterfaceForm(MAASServerTestCase):
         )
         self.assertItemsEqual([], interface.parents.all())
 
-    def test__creates_physical_interface_with_numa_node(self):
+    def test_creates_physical_interface_with_numa_node(self):
         node = factory.make_Node()
         numa_node = factory.make_NUMANode(node=node)
         mac_address = factory.make_mac_address()
@@ -298,7 +298,7 @@ class TestPhysicalInterfaceForm(MAASServerTestCase):
         self.assertEqual(interface.node, node)
         self.assertEqual(interface.numa_node, numa_node)
 
-    def test__creates_physical_interface_generates_name(self):
+    def test_creates_physical_interface_generates_name(self):
         node = factory.make_Node()
         interface_name = factory.make_name("eth")
         self.patch(node, "get_next_ifname").return_value = interface_name
@@ -328,7 +328,7 @@ class TestPhysicalInterfaceForm(MAASServerTestCase):
         )
         self.assertItemsEqual([], interface.parents.all())
 
-    def test__creates_physical_interface_disconnected(self):
+    def test_creates_physical_interface_disconnected(self):
         node = factory.make_Node()
         mac_address = factory.make_mac_address()
         interface_name = "eth0"
@@ -356,7 +356,7 @@ class TestPhysicalInterfaceForm(MAASServerTestCase):
         )
         self.assertItemsEqual([], interface.parents.all())
 
-    def test__create_ensures_link_up(self):
+    def test_create_ensures_link_up(self):
         node = factory.make_Node()
         mac_address = factory.make_mac_address()
         interface_name = "eth0"
@@ -377,7 +377,7 @@ class TestPhysicalInterfaceForm(MAASServerTestCase):
             interface.ip_addresses.filter(alloc_type=IPADDRESS_TYPE.STICKY)
         )
 
-    def test__requires_mac_address(self):
+    def test_requires_mac_address(self):
         interface_name = "eth0"
         vlan = factory.make_VLAN()
         form = PhysicalInterfaceForm(
@@ -444,7 +444,7 @@ class TestPhysicalInterfaceForm(MAASServerTestCase):
         interface = form.save()
         self.assertEquals(vlan, interface.vlan)
 
-    def test__rejects_parents(self):
+    def test_rejects_parents(self):
         parent = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         vlan = factory.make_VLAN()
         form = PhysicalInterfaceForm(
@@ -463,7 +463,7 @@ class TestPhysicalInterfaceForm(MAASServerTestCase):
             form.errors["parents"][0],
         )
 
-    def test__edits_interface(self):
+    def test_edits_interface(self):
         interface = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, name="eth0"
         )
@@ -488,7 +488,7 @@ class TestPhysicalInterfaceForm(MAASServerTestCase):
         )
         self.assertItemsEqual([], interface.parents.all())
 
-    def test__edits_doesnt_overwrite_name(self):
+    def test_edits_doesnt_overwrite_name(self):
         interface = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, name="eth0"
         )
@@ -508,7 +508,7 @@ class TestPhysicalInterfaceForm(MAASServerTestCase):
         )
         self.assertItemsEqual([], interface.parents.all())
 
-    def test__edits_interface_disconnected(self):
+    def test_edits_interface_disconnected(self):
         interface = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, name="eth0"
         )
@@ -532,7 +532,7 @@ class TestPhysicalInterfaceForm(MAASServerTestCase):
         )
         self.assertItemsEqual([], interface.parents.all())
 
-    def test__create_sets_interface_parameters(self):
+    def test_create_sets_interface_parameters(self):
         node = factory.make_Node()
         mac_address = factory.make_mac_address()
         interface_name = "eth0"
@@ -560,7 +560,7 @@ class TestPhysicalInterfaceForm(MAASServerTestCase):
             interface.params,
         )
 
-    def test__update_doesnt_change_interface_parameters(self):
+    def test_update_doesnt_change_interface_parameters(self):
         interface = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, name="eth0"
         )
@@ -590,7 +590,7 @@ class TestPhysicalInterfaceForm(MAASServerTestCase):
             interface.params,
         )
 
-    def test__update_does_change_interface_parameters(self):
+    def test_update_does_change_interface_parameters(self):
         interface = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, name="eth0"
         )
@@ -624,7 +624,7 @@ class TestPhysicalInterfaceForm(MAASServerTestCase):
             interface.params,
         )
 
-    def test__update_allows_clearing_interface_parameters(self):
+    def test_update_allows_clearing_interface_parameters(self):
         interface = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, name="eth0"
         )
@@ -646,7 +646,7 @@ class TestPhysicalInterfaceForm(MAASServerTestCase):
 
 
 class VLANInterfaceFormTest(MAASServerTestCase):
-    def test__creates_vlan_interface(self):
+    def test_creates_vlan_interface(self):
         vlan = factory.make_VLAN(vid=10)
         parent = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, vlan=vlan)
         form = VLANInterfaceForm(
@@ -663,7 +663,7 @@ class VLANInterfaceFormTest(MAASServerTestCase):
         )
         self.assertItemsEqual([parent], interface.parents.all())
 
-    def test__create_ensures_link_up(self):
+    def test_create_ensures_link_up(self):
         vlan = factory.make_VLAN(vid=10)
         parent = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, vlan=vlan)
         form = VLANInterfaceForm(
@@ -675,7 +675,7 @@ class VLANInterfaceFormTest(MAASServerTestCase):
             interface.ip_addresses.filter(alloc_type=IPADDRESS_TYPE.STICKY)
         )
 
-    def test__create_rejects_interface_without_vlan(self):
+    def test_create_rejects_interface_without_vlan(self):
         parent = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         form = VLANInterfaceForm(
             node=parent.node, data={"parents": [parent.id]}
@@ -716,7 +716,7 @@ class VLANInterfaceFormTest(MAASServerTestCase):
             form.errors["vlan"][0],
         )
 
-    def test__rejects_no_parents(self):
+    def test_rejects_no_parents(self):
         vlan = factory.make_VLAN(vid=10)
         form = VLANInterfaceForm(
             node=factory.make_Node(), data={"vlan": vlan.id}
@@ -728,7 +728,7 @@ class VLANInterfaceFormTest(MAASServerTestCase):
             form.errors["parents"][0],
         )
 
-    def test__rejects_vlan_parent(self):
+    def test_rejects_vlan_parent(self):
         parent = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         vlan_parent = factory.make_Interface(
             INTERFACE_TYPE.VLAN, parents=[parent]
@@ -745,7 +745,7 @@ class VLANInterfaceFormTest(MAASServerTestCase):
             form.errors["parents"][0],
         )
 
-    def test__rejects_no_vlan(self):
+    def test_rejects_no_vlan(self):
         parent = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         form = VLANInterfaceForm(
             node=parent.node, data={"vlan": None, "parents": [parent.id]}
@@ -757,7 +757,7 @@ class VLANInterfaceFormTest(MAASServerTestCase):
             form.errors["vlan"][0],
         )
 
-    def test__rejects_vlan_not_on_same_fabric(self):
+    def test_rejects_vlan_not_on_same_fabric(self):
         parent = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         factory.make_VLAN(fabric=parent.vlan.fabric, vid=10)
         other_vlan = factory.make_VLAN()
@@ -773,7 +773,7 @@ class VLANInterfaceFormTest(MAASServerTestCase):
             form.errors["vlan"][0],
         )
 
-    def test__rejects_parent_on_bond(self):
+    def test_rejects_parent_on_bond(self):
         parent = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         factory.make_Interface(INTERFACE_TYPE.BOND, parents=[parent])
         vlan = factory.make_VLAN(vid=10)
@@ -787,7 +787,7 @@ class VLANInterfaceFormTest(MAASServerTestCase):
             form.errors["parents"][0],
         )
 
-    def test__rejects_more_than_one_parent(self):
+    def test_rejects_more_than_one_parent(self):
         parent1 = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         parent2 = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, node=parent1.node
@@ -805,7 +805,7 @@ class VLANInterfaceFormTest(MAASServerTestCase):
         )
 
     @skip("XXX: GavinPanella 2017-03-29 bug=1677203: Fails spuriously.")
-    def test__edits_interface(self):
+    def test_edits_interface(self):
         parent = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         interface = factory.make_Interface(
             INTERFACE_TYPE.VLAN, parents=[parent]
@@ -828,7 +828,7 @@ class VLANInterfaceFormTest(MAASServerTestCase):
 
 
 class BondInterfaceFormTest(MAASServerTestCase):
-    def test__error_with_invalid_bond_mode(self):
+    def test_error_with_invalid_bond_mode(self):
         vlan = factory.make_VLAN(vid=10)
         parent1 = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, vlan=vlan)
         parent2 = factory.make_Interface(
@@ -856,7 +856,7 @@ class BondInterfaceFormTest(MAASServerTestCase):
             form.errors,
         )
 
-    def test__creates_bond_interface(self):
+    def test_creates_bond_interface(self):
         vlan = factory.make_VLAN(vid=10)
         parent1 = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, vlan=vlan)
         parent2 = factory.make_Interface(
@@ -886,7 +886,7 @@ class BondInterfaceFormTest(MAASServerTestCase):
         )
         self.assertItemsEqual([parent1, parent2], interface.parents.all())
 
-    def test__create_removes_parent_links_and_sets_link_up_on_bond(self):
+    def test_create_removes_parent_links_and_sets_link_up_on_bond(self):
         vlan = factory.make_VLAN(vid=10)
         parent1 = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, vlan=vlan)
         parent1.ensure_link_up()
@@ -921,7 +921,7 @@ class BondInterfaceFormTest(MAASServerTestCase):
             interface.ip_addresses.filter(alloc_type=IPADDRESS_TYPE.STICKY)
         )
 
-    def test__creates_bond_interface_with_parent_mac_address(self):
+    def test_creates_bond_interface_with_parent_mac_address(self):
         vlan = factory.make_VLAN(vid=10)
         parent1 = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, vlan=vlan)
         parent2 = factory.make_Interface(
@@ -949,7 +949,7 @@ class BondInterfaceFormTest(MAASServerTestCase):
         )
         self.assertItemsEqual([parent1, parent2], interface.parents.all())
 
-    def test__creates_bond_interface_with_default_bond_params(self):
+    def test_creates_bond_interface_with_default_bond_params(self):
         vlan = factory.make_VLAN(vid=10)
         parent1 = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, vlan=vlan)
         parent2 = factory.make_Interface(
@@ -979,7 +979,7 @@ class BondInterfaceFormTest(MAASServerTestCase):
             interface.params,
         )
 
-    def test__creates_bond_interface_with_bond_params(self):
+    def test_creates_bond_interface_with_bond_params(self):
         vlan = factory.make_VLAN(vid=10)
         parent1 = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, vlan=vlan)
         parent2 = factory.make_Interface(
@@ -1025,7 +1025,7 @@ class BondInterfaceFormTest(MAASServerTestCase):
             interface.params,
         )
 
-    def test__rejects_no_parents(self):
+    def test_rejects_no_parents(self):
         vlan = factory.make_VLAN(vid=10)
         interface_name = factory.make_name()
         form = BondInterfaceForm(
@@ -1039,7 +1039,7 @@ class BondInterfaceFormTest(MAASServerTestCase):
             form.errors["parents"][0],
         )
 
-    def test__rejects_when_parents_already_have_children(self):
+    def test_rejects_when_parents_already_have_children(self):
         node = factory.make_Node()
         parent1 = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, node=node, name="eth0"
@@ -1064,7 +1064,7 @@ class BondInterfaceFormTest(MAASServerTestCase):
             "Interfaces already in-use: eth0, eth1.", form.errors["parents"][0]
         )
 
-    def test__rejects_when_parents_not_in_same_vlan(self):
+    def test_rejects_when_parents_not_in_same_vlan(self):
         node = factory.make_Node()
         parent1 = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, node=node, name="eth0"
@@ -1083,7 +1083,7 @@ class BondInterfaceFormTest(MAASServerTestCase):
             form.errors["parents"][0],
         )
 
-    def test__edits_interface(self):
+    def test_edits_interface(self):
         parent1 = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         parent2 = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, node=parent1.node
@@ -1119,7 +1119,7 @@ class BondInterfaceFormTest(MAASServerTestCase):
             [parent1, parent2, new_parent], interface.parents.all()
         )
 
-    def test__edits_interface_allows_disconnected(self):
+    def test_edits_interface_allows_disconnected(self):
         parent1 = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         parent2 = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, node=parent1.node
@@ -1139,7 +1139,7 @@ class BondInterfaceFormTest(MAASServerTestCase):
             ),
         )
 
-    def test__edits_interface_removes_parents(self):
+    def test_edits_interface_removes_parents(self):
         parent1 = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         parent2 = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, node=parent1.node
@@ -1167,7 +1167,7 @@ class BondInterfaceFormTest(MAASServerTestCase):
         )
         self.assertItemsEqual([parent1, parent2], interface.parents.all())
 
-    def test__edits_interface_updates_mac_address_when_parent_removed(self):
+    def test_edits_interface_updates_mac_address_when_parent_removed(self):
         parent1 = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         parent2 = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, node=parent1.node
@@ -1198,7 +1198,7 @@ class BondInterfaceFormTest(MAASServerTestCase):
             interface.mac_address, [parent1.mac_address, parent2.mac_address]
         )
 
-    def test__edit_doesnt_overwrite_params(self):
+    def test_edit_doesnt_overwrite_params(self):
         parent1 = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         parent2 = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, node=parent1.node
@@ -1242,7 +1242,7 @@ class BondInterfaceFormTest(MAASServerTestCase):
             interface.params,
         )
 
-    def test__edit_does_overwrite_params(self):
+    def test_edit_does_overwrite_params(self):
         parent1 = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         parent2 = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, node=parent1.node
@@ -1304,7 +1304,7 @@ class BondInterfaceFormTest(MAASServerTestCase):
             interface.params,
         )
 
-    def test__edit_allows_zero_params(self):
+    def test_edit_allows_zero_params(self):
         parent1 = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         parent2 = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, node=parent1.node
@@ -1368,7 +1368,7 @@ class BondInterfaceFormTest(MAASServerTestCase):
 
 
 class BridgeInterfaceFormTest(MAASServerTestCase):
-    def test__creates_bridge_interface(self):
+    def test_creates_bridge_interface(self):
         parent = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         interface_name = factory.make_name()
         form = BridgeInterfaceForm(
@@ -1386,7 +1386,7 @@ class BridgeInterfaceFormTest(MAASServerTestCase):
         self.assertEqual(interface.mac_address, parent.mac_address)
         self.assertItemsEqual([parent], interface.parents.all())
 
-    def test__allows_bridge_on_parent_with_vlan_bridges(self):
+    def test_allows_bridge_on_parent_with_vlan_bridges(self):
         parent = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         vlan1 = factory.make_Interface(INTERFACE_TYPE.VLAN, parents=[parent])
         factory.make_Interface(INTERFACE_TYPE.BRIDGE, parents=[vlan1])
@@ -1408,7 +1408,7 @@ class BridgeInterfaceFormTest(MAASServerTestCase):
         self.assertEqual(interface.mac_address, parent.mac_address)
         self.assertItemsEqual([parent], interface.parents.all())
 
-    def test__allows_bridge_on_bond_with_vlan_bridges(self):
+    def test_allows_bridge_on_bond_with_vlan_bridges(self):
         node = factory.make_Node()
         eth0 = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node)
         eth1 = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node)
@@ -1434,7 +1434,7 @@ class BridgeInterfaceFormTest(MAASServerTestCase):
         self.assertEqual(interface.mac_address, bond0.mac_address)
         self.assertItemsEqual([bond0], interface.parents.all())
 
-    def test__create_removes_parent_links_and_sets_link_up_on_bridge(self):
+    def test_create_removes_parent_links_and_sets_link_up_on_bridge(self):
         parent = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         parent.ensure_link_up()
         interface_name = factory.make_name()
@@ -1454,7 +1454,7 @@ class BridgeInterfaceFormTest(MAASServerTestCase):
             interface.ip_addresses.filter(alloc_type=IPADDRESS_TYPE.STICKY)
         )
 
-    def test__creates_bridge_interface_with_parent_mac_address(self):
+    def test_creates_bridge_interface_with_parent_mac_address(self):
         parent = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         interface_name = factory.make_name()
         form = BridgeInterfaceForm(
@@ -1477,7 +1477,7 @@ class BridgeInterfaceFormTest(MAASServerTestCase):
         )
         self.assertItemsEqual([parent], interface.parents.all())
 
-    def test__rejects_no_parent(self):
+    def test_rejects_no_parent(self):
         interface_name = factory.make_name()
         form = BridgeInterfaceForm(
             node=factory.make_Node(), data={"name": interface_name}
@@ -1489,7 +1489,7 @@ class BridgeInterfaceFormTest(MAASServerTestCase):
             form.errors["parents"][0],
         )
 
-    def test__rejects_when_parent_already_have_children(self):
+    def test_rejects_when_parent_already_have_children(self):
         node = factory.make_Node()
         eth0 = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, node=node, name="eth0"
@@ -1513,7 +1513,7 @@ class BridgeInterfaceFormTest(MAASServerTestCase):
             "Interfaces already in-use: eth0.", form.errors["parents"][0]
         )
 
-    def test__rejects_when_parent_is_bridge(self):
+    def test_rejects_when_parent_is_bridge(self):
         node = factory.make_Node()
         bridge = factory.make_Interface(INTERFACE_TYPE.BRIDGE, node=node)
         interface_name = factory.make_name()
@@ -1527,7 +1527,7 @@ class BridgeInterfaceFormTest(MAASServerTestCase):
             form.errors["parents"][0],
         )
 
-    def test__rejects_when_parent_is_already_in_a_bridge(self):
+    def test_rejects_when_parent_is_already_in_a_bridge(self):
         node = factory.make_Node()
         parent = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node)
         factory.make_Interface(
@@ -1544,7 +1544,7 @@ class BridgeInterfaceFormTest(MAASServerTestCase):
             form.errors["parents"][0],
         )
 
-    def test__rejects_when_parent_is_already_in_a_bond(self):
+    def test_rejects_when_parent_is_already_in_a_bond(self):
         node = factory.make_Node()
         parent1 = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node)
         parent2 = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node)
@@ -1562,7 +1562,7 @@ class BridgeInterfaceFormTest(MAASServerTestCase):
             form.errors["parents"][0],
         )
 
-    def test__edits_interface(self):
+    def test_edits_interface(self):
         parent = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         interface = factory.make_Interface(
             INTERFACE_TYPE.BRIDGE, parents=[parent]
@@ -1594,7 +1594,7 @@ class BridgeInterfaceFormTest(MAASServerTestCase):
         )
         self.assertItemsEqual([new_parent], interface.parents.all())
 
-    def test__edits_interface_allows_disconnected(self):
+    def test_edits_interface_allows_disconnected(self):
         parent = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         interface = factory.make_Interface(
             INTERFACE_TYPE.BRIDGE, parents=[parent]
@@ -1611,7 +1611,7 @@ class BridgeInterfaceFormTest(MAASServerTestCase):
             ),
         )
 
-    def test__edit_doesnt_overwrite_params(self):
+    def test_edit_doesnt_overwrite_params(self):
         """Check that updating parameters that are not bridge specific do not
         overwrite the bridge specific parameters."""
         parent = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
@@ -1640,7 +1640,7 @@ class BridgeInterfaceFormTest(MAASServerTestCase):
             interface.params,
         )
 
-    def test__edit_does_overwrite_params(self):
+    def test_edit_does_overwrite_params(self):
         """Check that updating specific bridge parameters that do actually
         update the parameters."""
         parent = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
@@ -1680,7 +1680,7 @@ class BridgeInterfaceFormTest(MAASServerTestCase):
             interface.params,
         )
 
-    def test__edit_allows_zero_params(self):
+    def test_edit_allows_zero_params(self):
         parent = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         interface = factory.make_Interface(
             INTERFACE_TYPE.BRIDGE, parents=[parent]
@@ -1720,7 +1720,7 @@ class BridgeInterfaceFormTest(MAASServerTestCase):
 
 
 class AcquiredBridgeInterfaceFormTest(MAASServerTestCase):
-    def test__creates_acquired_bridge_interface(self):
+    def test_creates_acquired_bridge_interface(self):
         interface_name = factory.make_name("br")
         node = factory.make_Node()
         parent_fabric = factory.make_Fabric()
@@ -1760,7 +1760,7 @@ class AcquiredBridgeInterfaceFormTest(MAASServerTestCase):
         self.assertItemsEqual([parent_sip], interface.ip_addresses.all())
         self.assertItemsEqual([], parent.ip_addresses.all())
 
-    def test__rejects_no_parent(self):
+    def test_rejects_no_parent(self):
         interface_name = factory.make_name()
         form = AcquiredBridgeInterfaceForm(
             node=factory.make_Node(), data={"name": interface_name}
@@ -1772,7 +1772,7 @@ class AcquiredBridgeInterfaceFormTest(MAASServerTestCase):
             form.errors["parents"][0],
         )
 
-    def test__rejects_when_parent_already_have_non_vlan_children(self):
+    def test_rejects_when_parent_already_have_non_vlan_children(self):
         node = factory.make_Node()
         eth0 = factory.make_Interface(
             INTERFACE_TYPE.PHYSICAL, node=node, name="eth0"
@@ -1794,7 +1794,7 @@ class AcquiredBridgeInterfaceFormTest(MAASServerTestCase):
             "Interfaces already in-use: eth0.", form.errors["parents"][0]
         )
 
-    def test__rejects_when_parent_is_bridge(self):
+    def test_rejects_when_parent_is_bridge(self):
         node = factory.make_Node()
         bridge = factory.make_Interface(INTERFACE_TYPE.BRIDGE, node=node)
         interface_name = factory.make_name()
@@ -1808,7 +1808,7 @@ class AcquiredBridgeInterfaceFormTest(MAASServerTestCase):
             form.errors["parents"][0],
         )
 
-    def test__rejects_when_parent_is_already_in_a_bridge(self):
+    def test_rejects_when_parent_is_already_in_a_bridge(self):
         node = factory.make_Node()
         parent = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node)
         factory.make_Interface(
@@ -1825,7 +1825,7 @@ class AcquiredBridgeInterfaceFormTest(MAASServerTestCase):
             form.errors["parents"][0],
         )
 
-    def test__rejects_when_parent_is_already_in_a_bond(self):
+    def test_rejects_when_parent_is_already_in_a_bond(self):
         node = factory.make_Node()
         parent1 = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node)
         parent2 = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node)
diff --git a/src/maasserver/forms/tests/test_interface_link.py b/src/maasserver/forms/tests/test_interface_link.py
index ae4fbc6..42ebce1 100644
--- a/src/maasserver/forms/tests/test_interface_link.py
+++ b/src/maasserver/forms/tests/test_interface_link.py
@@ -22,20 +22,20 @@ from maasserver.utils.orm import get_one, reload_object
 
 
 class TestInterfaceLinkForm(MAASServerTestCase):
-    def test__requires_mode(self):
+    def test_requires_mode(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         form = InterfaceLinkForm(instance=interface, data={})
         self.assertFalse(form.is_valid(), form.errors)
         self.assertEqual({"mode": ["This field is required."]}, form.errors)
 
-    def test__mode_is_case_insensitive(self):
+    def test_mode_is_case_insensitive(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         form = InterfaceLinkForm(
             instance=interface, data={"mode": INTERFACE_LINK_TYPE.DHCP.upper()}
         )
         self.assertTrue(form.is_valid(), form.errors)
 
-    def test__sets_subnet_queryset_to_all_on_interface_wihtout_vlan(self):
+    def test_sets_subnet_queryset_to_all_on_interface_wihtout_vlan(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         interface.vlan = None
         interface.save()
@@ -44,13 +44,13 @@ class TestInterfaceLinkForm(MAASServerTestCase):
             list(Subnet.objects.all()), list(form.fields["subnet"].queryset)
         )
 
-    def test__sets_subnet_queryset_to_subnets_on_interface_vlan(self):
+    def test_sets_subnet_queryset_to_subnets_on_interface_vlan(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         subnets = [factory.make_Subnet(vlan=interface.vlan) for _ in range(3)]
         form = InterfaceLinkForm(instance=interface, data={})
         self.assertItemsEqual(subnets, form.fields["subnet"].queryset)
 
-    def test__AUTO_requires_subnet(self):
+    def test_AUTO_requires_subnet(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         form = InterfaceLinkForm(
             instance=interface, data={"mode": INTERFACE_LINK_TYPE.AUTO}
@@ -58,7 +58,7 @@ class TestInterfaceLinkForm(MAASServerTestCase):
         self.assertFalse(form.is_valid(), form.errors)
         self.assertEqual({"subnet": ["This field is required."]}, form.errors)
 
-    def test__AUTO_creates_link_to_AUTO_with_subnet(self):
+    def test_AUTO_creates_link_to_AUTO_with_subnet(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         auto_subnet = factory.make_Subnet(vlan=interface.vlan)
         form = InterfaceLinkForm(
@@ -70,7 +70,7 @@ class TestInterfaceLinkForm(MAASServerTestCase):
         auto_ip = interface.ip_addresses.get(alloc_type=IPADDRESS_TYPE.AUTO)
         self.assertEqual(auto_subnet, auto_ip.subnet)
 
-    def test__AUTO_sets_node_gateway_link_v4(self):
+    def test_AUTO_sets_node_gateway_link_v4(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         network = factory.make_ipv4_network()
         auto_subnet = factory.make_Subnet(
@@ -90,7 +90,7 @@ class TestInterfaceLinkForm(MAASServerTestCase):
         node = interface.get_node()
         self.assertEqual(auto_ip, node.gateway_link_ipv4)
 
-    def test__AUTO_sets_node_gateway_link_v6(self):
+    def test_AUTO_sets_node_gateway_link_v6(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         network = factory.make_ipv6_network()
         auto_subnet = factory.make_Subnet(
@@ -110,7 +110,7 @@ class TestInterfaceLinkForm(MAASServerTestCase):
         node = interface.get_node()
         self.assertEqual(auto_ip, node.gateway_link_ipv6)
 
-    def test__AUTO_default_gateway_requires_subnet(self):
+    def test_AUTO_default_gateway_requires_subnet(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         form = InterfaceLinkForm(
             instance=interface,
@@ -127,7 +127,7 @@ class TestInterfaceLinkForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__AUTO_default_gateway_requires_subnet_with_gateway_ip(self):
+    def test_AUTO_default_gateway_requires_subnet_with_gateway_ip(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         auto_subnet = factory.make_Subnet(vlan=interface.vlan)
         auto_subnet.gateway_ip = None
@@ -151,7 +151,7 @@ class TestInterfaceLinkForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__DHCP_not_allowed_if_already_DHCP_with_subnet(self):
+    def test_DHCP_not_allowed_if_already_DHCP_with_subnet(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         dhcp_subnet = factory.make_Subnet()
         factory.make_StaticIPAddress(
@@ -173,7 +173,7 @@ class TestInterfaceLinkForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__DHCP_not_allowed_if_already_DHCP_without_subnet(self):
+    def test_DHCP_not_allowed_if_already_DHCP_without_subnet(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         static_ip = factory.make_StaticIPAddress(
             alloc_type=IPADDRESS_TYPE.DHCP, ip="", interface=interface
@@ -188,7 +188,7 @@ class TestInterfaceLinkForm(MAASServerTestCase):
             {"mode": ["Interface is already set to DHCP."]}, form.errors
         )
 
-    def test__DHCP_not_allowed_default_gateway(self):
+    def test_DHCP_not_allowed_default_gateway(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         form = InterfaceLinkForm(
             instance=interface,
@@ -204,7 +204,7 @@ class TestInterfaceLinkForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__DHCP_creates_link_to_DHCP_with_subnet(self):
+    def test_DHCP_creates_link_to_DHCP_with_subnet(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         dhcp_subnet = factory.make_Subnet(vlan=interface.vlan)
         form = InterfaceLinkForm(
@@ -216,7 +216,7 @@ class TestInterfaceLinkForm(MAASServerTestCase):
         dhcp_ip = interface.ip_addresses.get(alloc_type=IPADDRESS_TYPE.DHCP)
         self.assertEqual(dhcp_subnet, dhcp_ip.subnet)
 
-    def test__DHCP_creates_link_to_DHCP_without_subnet(self):
+    def test_DHCP_creates_link_to_DHCP_without_subnet(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         form = InterfaceLinkForm(
             instance=interface, data={"mode": INTERFACE_LINK_TYPE.DHCP}
@@ -229,7 +229,7 @@ class TestInterfaceLinkForm(MAASServerTestCase):
             )
         )
 
-    def test__STATIC_requires_subnet(self):
+    def test_STATIC_requires_subnet(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         form = InterfaceLinkForm(
             instance=interface, data={"mode": INTERFACE_LINK_TYPE.STATIC}
@@ -237,7 +237,7 @@ class TestInterfaceLinkForm(MAASServerTestCase):
         self.assertFalse(form.is_valid(), form.errors)
         self.assertEqual({"subnet": ["This field is required."]}, form.errors)
 
-    def test__STATIC_not_allowed_if_ip_address_not_in_subnet(self):
+    def test_STATIC_not_allowed_if_ip_address_not_in_subnet(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         network = factory.make_ipv4_network()
         subnet = factory.make_Subnet(
@@ -262,7 +262,7 @@ class TestInterfaceLinkForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__STATIC_not_allowed_if_ip_address_in_dynamic_range(self):
+    def test_STATIC_not_allowed_if_ip_address_in_dynamic_range(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         subnet = factory.make_ipv4_Subnet_with_IPRanges(vlan=interface.vlan)
         dynamic_range = subnet.get_dynamic_ranges()[0]
@@ -286,7 +286,7 @@ class TestInterfaceLinkForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__STATIC_sets_ip_in_unmanaged_subnet(self):
+    def test_STATIC_sets_ip_in_unmanaged_subnet(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         subnet = factory.make_Subnet(vlan=interface.vlan)
         ip = factory.pick_ip_in_network(subnet.get_ipnetwork())
@@ -308,7 +308,7 @@ class TestInterfaceLinkForm(MAASServerTestCase):
             )
         )
 
-    def test__STATIC_sets_ip_for_unmanaged_subnet_specifier(self):
+    def test_STATIC_sets_ip_for_unmanaged_subnet_specifier(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         subnet = factory.make_Subnet(vlan=interface.vlan)
         ip = factory.pick_ip_in_network(subnet.get_ipnetwork())
@@ -330,7 +330,7 @@ class TestInterfaceLinkForm(MAASServerTestCase):
             )
         )
 
-    def test__STATIC_sets_ip_for_subnet_cidr_specifier(self):
+    def test_STATIC_sets_ip_for_subnet_cidr_specifier(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         subnet = factory.make_Subnet(vlan=interface.vlan)
         ip = factory.pick_ip_in_network(subnet.get_ipnetwork())
@@ -352,7 +352,7 @@ class TestInterfaceLinkForm(MAASServerTestCase):
             )
         )
 
-    def test__STATIC_sets_ip_in_subnet(self):
+    def test_STATIC_sets_ip_in_subnet(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         subnet = factory.make_Subnet(vlan=interface.vlan)
         ip_in_subnet = factory.pick_ip_in_Subnet(subnet)
@@ -376,7 +376,7 @@ class TestInterfaceLinkForm(MAASServerTestCase):
             )
         )
 
-    def test__STATIC_picks_ip_in_subnet(self):
+    def test_STATIC_picks_ip_in_subnet(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         subnet = factory.make_Subnet(vlan=interface.vlan)
         form = InterfaceLinkForm(
@@ -393,7 +393,7 @@ class TestInterfaceLinkForm(MAASServerTestCase):
         self.assertIsNotNone(ip_address)
         self.assertIn(IPAddress(ip_address.ip), subnet.get_ipnetwork())
 
-    def test__STATIC_sets_node_gateway_link_ipv4(self):
+    def test_STATIC_sets_node_gateway_link_ipv4(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         network = factory.make_ipv4_network()
         subnet = factory.make_Subnet(
@@ -417,7 +417,7 @@ class TestInterfaceLinkForm(MAASServerTestCase):
         node = interface.get_node()
         self.assertEqual(ip_address, node.gateway_link_ipv4)
 
-    def test__STATIC_sets_node_gateway_link_ipv6(self):
+    def test_STATIC_sets_node_gateway_link_ipv6(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         network = factory.make_ipv6_network()
         subnet = factory.make_Subnet(
@@ -441,7 +441,7 @@ class TestInterfaceLinkForm(MAASServerTestCase):
         node = interface.get_node()
         self.assertEqual(ip_address, node.gateway_link_ipv6)
 
-    def test__LINK_UP_not_allowed_with_other_ip_addresses(self):
+    def test_LINK_UP_not_allowed_with_other_ip_addresses(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         factory.make_StaticIPAddress(
             alloc_type=IPADDRESS_TYPE.DHCP, ip="", interface=interface
@@ -461,7 +461,7 @@ class TestInterfaceLinkForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__LINK_UP_creates_link_STICKY_with_subnet(self):
+    def test_LINK_UP_creates_link_STICKY_with_subnet(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         link_subnet = factory.make_Subnet(vlan=interface.vlan)
         form = InterfaceLinkForm(
@@ -477,7 +477,7 @@ class TestInterfaceLinkForm(MAASServerTestCase):
         self.assertIsNone(link_ip.ip)
         self.assertEqual(link_subnet, link_ip.subnet)
 
-    def test__LINK_UP_creates_link_STICKY_without_subnet(self):
+    def test_LINK_UP_creates_link_STICKY_without_subnet(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         form = InterfaceLinkForm(
             instance=interface, data={"mode": INTERFACE_LINK_TYPE.LINK_UP}
@@ -490,7 +490,7 @@ class TestInterfaceLinkForm(MAASServerTestCase):
         self.assertIsNotNone(link_ip)
         self.assertIsNone(link_ip.ip)
 
-    def test__LINK_UP_not_allowed_default_gateway(self):
+    def test_LINK_UP_not_allowed_default_gateway(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         form = InterfaceLinkForm(
             instance=interface,
@@ -541,13 +541,13 @@ class TestInterfaceLinkForm(MAASServerTestCase):
 
 
 class TestInterfaceUnlinkForm(MAASServerTestCase):
-    def test__requires_id(self):
+    def test_requires_id(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         form = InterfaceUnlinkForm(instance=interface, data={})
         self.assertFalse(form.is_valid(), form.errors)
         self.assertEqual({"id": ["This field is required."]}, form.errors)
 
-    def test__must_be_valid_id(self):
+    def test_must_be_valid_id(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         link_id = random.randint(100, 1000)
         form = InterfaceUnlinkForm(instance=interface, data={"id": link_id})
@@ -561,7 +561,7 @@ class TestInterfaceUnlinkForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__DHCP_deletes_link_with_subnet(self):
+    def test_DHCP_deletes_link_with_subnet(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         dhcp_subnet = factory.make_Subnet(vlan=interface.vlan)
         interface.link_subnet(INTERFACE_LINK_TYPE.DHCP, dhcp_subnet)
@@ -572,7 +572,7 @@ class TestInterfaceUnlinkForm(MAASServerTestCase):
         form.save()
         self.assertIsNone(reload_object(dhcp_ip))
 
-    def test__STATIC_deletes_link_in_subnet(self):
+    def test_STATIC_deletes_link_in_subnet(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         subnet = factory.make_Subnet(vlan=interface.vlan)
         ip = factory.pick_ip_in_network(subnet.get_ipnetwork())
@@ -592,7 +592,7 @@ class TestInterfaceUnlinkForm(MAASServerTestCase):
         form.save()
         self.assertIsNone(reload_object(static_ip))
 
-    def test__LINK_UP_deletes_link(self):
+    def test_LINK_UP_deletes_link(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         subnet = factory.make_Subnet(vlan=interface.vlan)
         link_ip = factory.make_StaticIPAddress(
@@ -622,7 +622,7 @@ class TestInterfaceSetDefaultGatwayForm(MAASServerTestCase):
             alloc_type=alloc_type, ip=ip, subnet=subnet, interface=interface
         )
 
-    def test__interface_needs_gateways(self):
+    def test_interface_needs_gateways(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         form = InterfaceSetDefaultGatwayForm(instance=interface, data={})
         self.assertFalse(form.is_valid(), form.errors)
@@ -631,14 +631,14 @@ class TestInterfaceSetDefaultGatwayForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__doesnt_require_link_id_if_only_one_gateway_per_family(self):
+    def test_doesnt_require_link_id_if_only_one_gateway_per_family(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         self.make_ip_family_link(interface, factory.make_ipv4_network())
         self.make_ip_family_link(interface, factory.make_ipv6_network())
         form = InterfaceSetDefaultGatwayForm(instance=interface, data={})
         self.assertTrue(form.is_valid(), form.errors)
 
-    def test__requires_link_id_if_more_than_one_gateway_per_family(self):
+    def test_requires_link_id_if_more_than_one_gateway_per_family(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         self.make_ip_family_link(interface, factory.make_ipv4_network())
         self.make_ip_family_link(interface, factory.make_ipv6_network())
@@ -656,7 +656,7 @@ class TestInterfaceSetDefaultGatwayForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__link_id_fields_setup_correctly(self):
+    def test_link_id_fields_setup_correctly(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         links = []
         for _ in range(2):
@@ -676,7 +676,7 @@ class TestInterfaceSetDefaultGatwayForm(MAASServerTestCase):
         choice_ids = [choice[0] for choice in form.fields["link_id"].choices]
         self.assertItemsEqual(link_ids, choice_ids)
 
-    def test__sets_gateway_links_works_on_dhcp_with_gateway_ip(self):
+    def test_sets_gateway_links_works_on_dhcp_with_gateway_ip(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         ipv4_link = self.make_ip_family_link(
             interface, factory.make_ipv4_network(), IPADDRESS_TYPE.DHCP
@@ -691,7 +691,7 @@ class TestInterfaceSetDefaultGatwayForm(MAASServerTestCase):
         self.assertEqual(ipv4_link, node.gateway_link_ipv4)
         self.assertEqual(ipv6_link, node.gateway_link_ipv6)
 
-    def test__sets_gateway_links_on_node_when_no_link_id(self):
+    def test_sets_gateway_links_on_node_when_no_link_id(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         ipv4_link = self.make_ip_family_link(
             interface, factory.make_ipv4_network()
@@ -706,7 +706,7 @@ class TestInterfaceSetDefaultGatwayForm(MAASServerTestCase):
         self.assertEqual(ipv4_link, node.gateway_link_ipv4)
         self.assertEqual(ipv6_link, node.gateway_link_ipv6)
 
-    def test__sets_gateway_link_v4_on_node_when_link_id(self):
+    def test_sets_gateway_link_v4_on_node_when_link_id(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         ipv4_link = self.make_ip_family_link(
             interface, factory.make_ipv4_network()
@@ -720,7 +720,7 @@ class TestInterfaceSetDefaultGatwayForm(MAASServerTestCase):
         node = interface.get_node()
         self.assertEqual(ipv4_link, node.gateway_link_ipv4)
 
-    def test__sets_gateway_link_v6_on_node_when_link_id(self):
+    def test_sets_gateway_link_v6_on_node_when_link_id(self):
         interface = factory.make_Interface(INTERFACE_TYPE.PHYSICAL)
         ipv6_link = self.make_ip_family_link(
             interface, factory.make_ipv6_network()
diff --git a/src/maasserver/forms/tests/test_iprange.py b/src/maasserver/forms/tests/test_iprange.py
index b2a6dbb..c8dfb70 100644
--- a/src/maasserver/forms/tests/test_iprange.py
+++ b/src/maasserver/forms/tests/test_iprange.py
@@ -17,11 +17,11 @@ from maasserver.utils.orm import reload_object
 
 
 class TestIPRangeForm(MAASServerTestCase):
-    def test__empty_form_fails_validation(self):
+    def test_empty_form_fails_validation(self):
         form = IPRangeForm({})
         self.assertFalse(form.is_valid(), dict(form.errors))
 
-    def test__requires_start_ip(self):
+    def test_requires_start_ip(self):
         subnet = factory.make_Subnet(cidr="10.0.0.0/24")
         comment = factory.make_name("comment")
         form = IPRangeForm(
@@ -37,7 +37,7 @@ class TestIPRangeForm(MAASServerTestCase):
             form.errors["start_ip"], Contains("This field is required.")
         )
 
-    def test__requires_end_ip(self):
+    def test_requires_end_ip(self):
         subnet = factory.make_Subnet(cidr="10.0.0.0/24")
         comment = factory.make_name("comment")
         form = IPRangeForm(
@@ -53,7 +53,7 @@ class TestIPRangeForm(MAASServerTestCase):
             form.errors["end_ip"], Contains("This field is required.")
         )
 
-    def test__requires_type(self):
+    def test_requires_type(self):
         subnet = factory.make_Subnet(cidr="10.0.0.0/24")
         comment = factory.make_name("comment")
         form = IPRangeForm(
@@ -69,7 +69,7 @@ class TestIPRangeForm(MAASServerTestCase):
             form.errors["type"], Contains("This field is required.")
         )
 
-    def test__requires_subnet(self):
+    def test_requires_subnet(self):
         comment = factory.make_name("comment")
         form = IPRangeForm(
             {
@@ -84,7 +84,7 @@ class TestIPRangeForm(MAASServerTestCase):
             form.errors["subnet"], Contains("This field is required.")
         )
 
-    def test__subnet_optional_if_it_can_be_found(self):
+    def test_subnet_optional_if_it_can_be_found(self):
         subnet = factory.make_Subnet(cidr="10.0.0.0/24")
         comment = factory.make_name("comment")
         form = IPRangeForm(
@@ -99,7 +99,7 @@ class TestIPRangeForm(MAASServerTestCase):
         iprange = form.save()
         self.assertEqual(iprange.subnet, subnet)
 
-    def test__comment_optional(self):
+    def test_comment_optional(self):
         subnet = factory.make_Subnet(cidr="10.0.0.0/24")
         form = IPRangeForm(
             {
@@ -113,7 +113,7 @@ class TestIPRangeForm(MAASServerTestCase):
         iprange = form.save()
         self.assertThat(iprange.comment, Equals(""))
 
-    def test__creates_iprange(self):
+    def test_creates_iprange(self):
         subnet = factory.make_Subnet(cidr="10.0.0.0/24")
         comment = factory.make_name("comment")
         form = IPRangeForm(
@@ -133,7 +133,7 @@ class TestIPRangeForm(MAASServerTestCase):
         self.assertEqual(iprange.type, IPRANGE_TYPE.RESERVED)
         self.assertEqual(iprange.comment, comment)
 
-    def test__creates_iprange_with_user(self):
+    def test_creates_iprange_with_user(self):
         subnet = factory.make_Subnet(cidr="10.0.0.0/24")
         comment = factory.make_name("comment")
         request = Mock()
@@ -157,7 +157,7 @@ class TestIPRangeForm(MAASServerTestCase):
         self.assertEqual(iprange.comment, comment)
         self.assertEqual(iprange.user, request.user)
 
-    def test__updates_iprange(self):
+    def test_updates_iprange(self):
         subnet = factory.make_ipv4_Subnet_with_IPRanges()
         iprange = subnet.get_dynamic_ranges().first()
         new_comment = factory.make_name("comment")
diff --git a/src/maasserver/forms/tests/test_machinewithmacaddresses.py b/src/maasserver/forms/tests/test_machinewithmacaddresses.py
index 4959e00..6e78321 100644
--- a/src/maasserver/forms/tests/test_machinewithmacaddresses.py
+++ b/src/maasserver/forms/tests/test_machinewithmacaddresses.py
@@ -46,7 +46,7 @@ class MachineWithMACAddressesFormTest(MAASServerTestCase):
         patch_usable_architectures(self, [architecture])
         return self.get_QueryDict(params)
 
-    def test__valid(self):
+    def test_valid(self):
         architecture = make_usable_architecture(self)
         form = MachineWithMACAddressesForm(
             data=self.make_params(
@@ -62,7 +62,7 @@ class MachineWithMACAddressesFormTest(MAASServerTestCase):
         )
         self.assertEqual(architecture, form.cleaned_data["architecture"])
 
-    def test__simple_invalid(self):
+    def test_simple_invalid(self):
         # If the form only has one (invalid) MAC address field to validate,
         # the error message in form.errors['mac_addresses'] is the
         # message from the field's validation error.
@@ -77,7 +77,7 @@ class MachineWithMACAddressesFormTest(MAASServerTestCase):
             form.errors["mac_addresses"],
         )
 
-    def test__multiple_invalid(self):
+    def test_multiple_invalid(self):
         # If the form has multiple MAC address fields to validate,
         # if one or more fields are invalid, a single error message is
         # present in form.errors['mac_addresses'] after validation.
@@ -96,7 +96,7 @@ class MachineWithMACAddressesFormTest(MAASServerTestCase):
             form.errors["mac_addresses"],
         )
 
-    def test__mac_in_use_on_current_node_passes(self):
+    def test_mac_in_use_on_current_node_passes(self):
         node = factory.make_Node_with_Interface_on_Subnet(
             address="aa:bb:cc:dd:ee:ff"
         )
@@ -116,7 +116,7 @@ class MachineWithMACAddressesFormTest(MAASServerTestCase):
         )
         self.assertEqual(architecture, form.cleaned_data["architecture"])
 
-    def test__with_mac_in_use_on_another_node_fails(self):
+    def test_with_mac_in_use_on_another_node_fails(self):
         factory.make_Node_with_Interface_on_Subnet(address="aa:bb:cc:dd:ee:ff")
         architecture = make_usable_architecture(self)
         node = factory.make_Node_with_Interface_on_Subnet()
@@ -131,7 +131,7 @@ class MachineWithMACAddressesFormTest(MAASServerTestCase):
         self.assertFalse(form.is_valid(), dict(form.errors))
         self.assertThat(dict(form.errors), Contains("mac_addresses"))
 
-    def test__with_mac_in_use_on_uknown_interface_passes(self):
+    def test_with_mac_in_use_on_uknown_interface_passes(self):
         factory.make_Interface(
             INTERFACE_TYPE.UNKNOWN, mac_address="aa:bb:cc:dd:ee:ff"
         )
@@ -150,7 +150,7 @@ class MachineWithMACAddressesFormTest(MAASServerTestCase):
         )
         self.assertEqual(architecture, form.cleaned_data["architecture"])
 
-    def test__empty(self):
+    def test_empty(self):
         # Empty values in the list of MAC addresses are simply ignored.
         form = MachineWithMACAddressesForm(
             data=self.make_params(
@@ -160,7 +160,7 @@ class MachineWithMACAddressesFormTest(MAASServerTestCase):
 
         self.assertTrue(form.is_valid())
 
-    def test__mac_address_is_required(self):
+    def test_mac_address_is_required(self):
         form = MachineWithMACAddressesForm(
             data=self.make_params(mac_addresses=[])
         )
@@ -171,7 +171,7 @@ class MachineWithMACAddressesFormTest(MAASServerTestCase):
             ["This field is required."], form.errors["mac_addresses"]
         )
 
-    def test__no_architecture_or_mac_addresses_is_ok_for_ipmi(self):
+    def test_no_architecture_or_mac_addresses_is_ok_for_ipmi(self):
         # No architecture or MAC addresses is okay for IPMI power types.
         params = self.make_params(mac_addresses=[])
         params["architecture"] = None
@@ -179,7 +179,7 @@ class MachineWithMACAddressesFormTest(MAASServerTestCase):
         form = MachineWithMACAddressesForm(data=params)
         self.assertTrue(form.is_valid())
 
-    def test__save(self):
+    def test_save(self):
         macs = ["aa:bb:cc:dd:ee:ff", "9a:bb:c3:33:e5:7f"]
         form = MachineWithMACAddressesForm(
             data=self.make_params(mac_addresses=macs)
diff --git a/src/maasserver/forms/tests/test_notification.py b/src/maasserver/forms/tests/test_notification.py
index cb2196e..632d1f8 100644
--- a/src/maasserver/forms/tests/test_notification.py
+++ b/src/maasserver/forms/tests/test_notification.py
@@ -18,7 +18,7 @@ categories = "info", "success", "warning", "error"
 
 
 class TestNotificationForm(MAASServerTestCase):
-    def test__notification_can_be_created_with_just_message(self):
+    def test_notification_can_be_created_with_just_message(self):
         notification_message = factory.make_name("message")
         form = NotificationForm({"message": notification_message})
         self.assertTrue(form.is_valid(), form.errors)
@@ -36,7 +36,7 @@ class TestNotificationForm(MAASServerTestCase):
             ),
         )
 
-    def test__notification_can_be_created_with_empty_fields(self):
+    def test_notification_can_be_created_with_empty_fields(self):
         notification_message = factory.make_name("message")
         form = NotificationForm(
             {
@@ -65,7 +65,7 @@ class TestNotificationForm(MAASServerTestCase):
             ),
         )
 
-    def test__notification_can_be_created_with_all_fields(self):
+    def test_notification_can_be_created_with_all_fields(self):
         user = factory.make_User()
         data = {
             "ident": factory.make_name("ident"),
@@ -92,7 +92,7 @@ class TestNotificationForm(MAASServerTestCase):
         )
         self.assertThat(notification, MatchesStructure.byEquality(**expected))
 
-    def test__notification_can_be_updated(self):
+    def test_notification_can_be_updated(self):
         notification = factory.make_Notification()
         user = factory.make_User()
         data = {
diff --git a/src/maasserver/forms/tests/test_packagerepository.py b/src/maasserver/forms/tests/test_packagerepository.py
index 8b3b22f..549f73b 100644
--- a/src/maasserver/forms/tests/test_packagerepository.py
+++ b/src/maasserver/forms/tests/test_packagerepository.py
@@ -48,7 +48,7 @@ class TestPackageRepositoryForm(MAASServerTestCase):
         }
         return params
 
-    def test__creates_package_repository(self):
+    def test_creates_package_repository(self):
         repo = factory.make_PackageRepository()
         params = self.make_valid_repo_params(repo)
         form = PackageRepositoryForm(data=params)
@@ -65,17 +65,17 @@ class TestPackageRepositoryForm(MAASServerTestCase):
             "Created package repository '%s'." % package_repository.name,
         )
 
-    def test__create_package_repository_requires_name(self):
+    def test_create_package_repository_requires_name(self):
         form = PackageRepositoryForm(
             data={"url": factory.make_url(scheme="http")}
         )
         self.assertFalse(form.is_valid())
 
-    def test__create_package_repository_requires_url(self):
+    def test_create_package_repository_requires_url(self):
         form = PackageRepositoryForm(data={"name": factory.make_name("name")})
         self.assertFalse(form.is_valid())
 
-    def test__default_repository_cannot_be_disabled(self):
+    def test_default_repository_cannot_be_disabled(self):
         repo = factory.make_PackageRepository(default=True)
         params = self.make_valid_repo_params(repo)
         params["enabled"] = False
@@ -83,7 +83,7 @@ class TestPackageRepositoryForm(MAASServerTestCase):
         self.assertFalse(form.is_valid())
         self.assertRaises(ValidationError, form.clean)
 
-    def test__create_package_repository_defaults_to_enabled(self):
+    def test_create_package_repository_defaults_to_enabled(self):
         repo = factory.make_PackageRepository()
         params = self.make_valid_repo_params(repo)
         del params["enabled"]
@@ -96,7 +96,7 @@ class TestPackageRepositoryForm(MAASServerTestCase):
         self.assertAttributes(package_repository, params)
         self.assertTrue(package_repository.enabled)
 
-    def test__fail_validation_on_create_cleans_url(self):
+    def test_fail_validation_on_create_cleans_url(self):
         PackageRepository.objects.all().delete()
         repo = factory.make_PackageRepository()
         params = self.make_valid_repo_params(repo)
@@ -106,7 +106,7 @@ class TestPackageRepositoryForm(MAASServerTestCase):
         self.assertFalse(form.is_valid())
         self.assertItemsEqual([], PackageRepository.objects.all())
 
-    def test__updates_name(self):
+    def test_updates_name(self):
         package_repository = factory.make_PackageRepository()
         name = factory.make_name("name")
         form = PackageRepositoryForm(
@@ -125,7 +125,7 @@ class TestPackageRepositoryForm(MAASServerTestCase):
             "Updated package repository '%s'." % (package_repository.name),
         )
 
-    def test__updates_url(self):
+    def test_updates_url(self):
         package_repository = factory.make_PackageRepository()
         url = factory.make_url(scheme="http")
         form = PackageRepositoryForm(
@@ -138,7 +138,7 @@ class TestPackageRepositoryForm(MAASServerTestCase):
         package_repository = form.save(endpoint, request)
         self.assertEqual(url, package_repository.url)
 
-    def test__updates_enabled(self):
+    def test_updates_enabled(self):
         package_repository = factory.make_PackageRepository()
         enabled = not package_repository.enabled
         form = PackageRepositoryForm(
@@ -151,7 +151,7 @@ class TestPackageRepositoryForm(MAASServerTestCase):
         package_repository = form.save(endpoint, request)
         self.assertEqual(enabled, package_repository.enabled)
 
-    def test__updates_arches(self):
+    def test_updates_arches(self):
         package_repository = factory.make_PackageRepository()
         arch1 = random.choice(PackageRepository.KNOWN_ARCHES)
         arch2 = random.choice(PackageRepository.KNOWN_ARCHES)
@@ -166,7 +166,7 @@ class TestPackageRepositoryForm(MAASServerTestCase):
         package_repository = form.save(endpoint, request)
         self.assertEqual([arch1, arch2, arch3], package_repository.arches)
 
-    def test__update_failure_doesnt_delete_url(self):
+    def test_update_failure_doesnt_delete_url(self):
         package_repository = factory.make_PackageRepository()
         url = package_repository.url
         form = PackageRepositoryForm(
@@ -176,7 +176,7 @@ class TestPackageRepositoryForm(MAASServerTestCase):
         self.assertFalse(form.is_valid())
         self.assertEquals(url, reload_object(package_repository).url)
 
-    def test__creates_package_repository_defaults_main_arches(self):
+    def test_creates_package_repository_defaults_main_arches(self):
         repo = factory.make_PackageRepository(arches=[])
         params = self.make_valid_repo_params(repo)
         del params["arches"]
@@ -191,7 +191,7 @@ class TestPackageRepositoryForm(MAASServerTestCase):
             package_repository.arches, PackageRepository.MAIN_ARCHES
         )
 
-    def test__arches_validation(self):
+    def test_arches_validation(self):
         package_repository = factory.make_PackageRepository()
         form = PackageRepositoryForm(
             instance=package_repository, data={"arches": ["i286"]}
@@ -208,7 +208,7 @@ class TestPackageRepositoryForm(MAASServerTestCase):
         endpoint = factory.pick_choice(ENDPOINT_CHOICES)
         self.assertRaises(ValueError, form.save, endpoint, request)
 
-    def test__arches_comma_cleaning(self):
+    def test_arches_comma_cleaning(self):
         package_repository = factory.make_PackageRepository()
         form = PackageRepositoryForm(
             instance=package_repository, data={"arches": ["i386,armhf"]}
@@ -229,7 +229,7 @@ class TestPackageRepositoryForm(MAASServerTestCase):
         repo = form.save(endpoint, request)
         self.assertItemsEqual(["i386"], repo.arches)
 
-    def test__distribution_comma_cleaning(self):
+    def test_distribution_comma_cleaning(self):
         package_repository = factory.make_PackageRepository()
         form = PackageRepositoryForm(
             instance=package_repository, data={"distributions": ["val1,val2"]}
@@ -250,7 +250,7 @@ class TestPackageRepositoryForm(MAASServerTestCase):
         repo = form.save(endpoint, request)
         self.assertItemsEqual(["val1"], repo.distributions)
 
-    def test__disabled_pocket_comma_cleaning(self):
+    def test_disabled_pocket_comma_cleaning(self):
         package_repository = factory.make_PackageRepository()
         form = PackageRepositoryForm(
             instance=package_repository,
@@ -273,7 +273,7 @@ class TestPackageRepositoryForm(MAASServerTestCase):
         repo = form.save(endpoint, request)
         self.assertItemsEqual(["updates"], repo.disabled_pockets)
 
-    def test__disabled_component_comma_cleaning(self):
+    def test_disabled_component_comma_cleaning(self):
         package_repository = factory.make_PackageRepository(
             default=True, components=[]
         )
@@ -303,7 +303,7 @@ class TestPackageRepositoryForm(MAASServerTestCase):
         repo = form.save(endpoint, request)
         self.assertItemsEqual(["universe"], repo.disabled_components)
 
-    def test__component_comma_cleaning(self):
+    def test_component_comma_cleaning(self):
         package_repository = factory.make_PackageRepository()
         form = PackageRepositoryForm(
             instance=package_repository, data={"components": ["val1,val2"]}
@@ -324,7 +324,7 @@ class TestPackageRepositoryForm(MAASServerTestCase):
         repo = form.save(endpoint, request)
         self.assertItemsEqual(["val1"], repo.components)
 
-    def test__updates_disable_sources(self):
+    def test_updates_disable_sources(self):
         package_repository = factory.make_PackageRepository()
         form = PackageRepositoryForm(
             instance=package_repository, data={"disable_sources": True}
diff --git a/src/maasserver/forms/tests/test_parameters.py b/src/maasserver/forms/tests/test_parameters.py
index a41f24f..d6b7884 100644
--- a/src/maasserver/forms/tests/test_parameters.py
+++ b/src/maasserver/forms/tests/test_parameters.py
@@ -43,14 +43,14 @@ class TestParametersForm(MAASServerTestCase):
             ]
         )
 
-    def test__validates_parameters_is_dict(self):
+    def test_validates_parameters_is_dict(self):
         form = ParametersForm(data=[factory.make_name() for _ in range(3)])
         self.assertFalse(form.is_valid())
         self.assertDictEqual(
             {"parameters": ["Must be a dictionary"]}, form.errors
         )
 
-    def test__validates_parameter_is_str(self):
+    def test_validates_parameter_is_str(self):
         param = random.randint(0, 1000)
         form = ParametersForm(data={param: {"type": "storage"}})
         self.assertFalse(form.is_valid())
@@ -59,7 +59,7 @@ class TestParametersForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__validates_parameter_field_type_is_str(self):
+    def test_validates_parameter_field_type_is_str(self):
         param_type = random.randint(0, 1000)
         form = ParametersForm(
             data={"storage": {"type": param_type, "required": False}}
@@ -70,7 +70,7 @@ class TestParametersForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__validates_parameter_field_min_is_int(self):
+    def test_validates_parameter_field_min_is_int(self):
         param_min = factory.make_name("min")
         form = ParametersForm(
             data={"runtime": {"type": "runtime", "min": param_min}}
@@ -81,7 +81,7 @@ class TestParametersForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__validates_parameter_field_max_is_int(self):
+    def test_validates_parameter_field_max_is_int(self):
         param_max = factory.make_name("max")
         form = ParametersForm(
             data={"runtime": {"type": "runtime", "max": param_max}}
@@ -92,7 +92,7 @@ class TestParametersForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__validates_parameter_field_title_is_str(self):
+    def test_validates_parameter_field_title_is_str(self):
         form = ParametersForm(
             data={"storage": {"type": "storage", "title": True}}
         )
@@ -101,7 +101,7 @@ class TestParametersForm(MAASServerTestCase):
             {"parameters": ["True: title must be a string"]}, form.errors
         )
 
-    def test__validates_parameter_field_description_is_str(self):
+    def test_validates_parameter_field_description_is_str(self):
         form = ParametersForm(
             data={"storage": {"type": "storage", "description": True}}
         )
@@ -110,7 +110,7 @@ class TestParametersForm(MAASServerTestCase):
             {"parameters": ["True: description must be a string"]}, form.errors
         )
 
-    def test__validates_parameter_field_argument_format_is_str(self):
+    def test_validates_parameter_field_argument_format_is_str(self):
         form = ParametersForm(
             data={"storage": {"type": "storage", "argument_format": []}}
         )
@@ -120,7 +120,7 @@ class TestParametersForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__validates_parameter_field_argument_format_for_storage_type(self):
+    def test_validates_parameter_field_argument_format_for_storage_type(self):
         form = ParametersForm(
             data={
                 "storage": {
@@ -140,7 +140,7 @@ class TestParametersForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__validates_parameter_field_argument_format_for_interface(self):
+    def test_validates_parameter_field_argument_format_for_interface(self):
         form = ParametersForm(
             data={
                 "storage": {
@@ -160,7 +160,7 @@ class TestParametersForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__validates_parameter_field_argument_format_non_runtime_type(self):
+    def test_validates_parameter_field_argument_format_non_runtime_type(self):
         form = ParametersForm(
             data={
                 "runtime": {
@@ -175,7 +175,7 @@ class TestParametersForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__validates_parameter_field_default_is_str(self):
+    def test_validates_parameter_field_default_is_str(self):
         param_default = random.randint(0, 1000)
         form = ParametersForm(
             data={"storage": {"type": "storage", "default": param_default}}
@@ -186,7 +186,7 @@ class TestParametersForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__validates_parameter_field_required_is_boolean(self):
+    def test_validates_parameter_field_required_is_boolean(self):
         param_required = factory.make_name("required")
         form = ParametersForm(
             data={"storage": {"type": "storage", "required": param_required}}
@@ -201,7 +201,7 @@ class TestParametersForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__validates_parameter_field_allow_list_is_boolean(self):
+    def test_validates_parameter_field_allow_list_is_boolean(self):
         param_allow_list = factory.make_name("allow_list")
         form = ParametersForm(
             data={"url": {"type": "url", "allow_list": param_allow_list}}
@@ -216,7 +216,7 @@ class TestParametersForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__validates_parameter_field_allow_list_only_for_url(self):
+    def test_validates_parameter_field_allow_list_only_for_url(self):
         ptype = random.choice(["storage", "interface", "runtime"])
         form = ParametersForm(
             data={ptype: {"type": ptype, "allow_list": factory.pick_bool()}}
@@ -227,7 +227,7 @@ class TestParametersForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__checks_for_supported_parameter_types(self):
+    def test_checks_for_supported_parameter_types(self):
         form = ParametersForm(
             data={
                 "storage": {"type": "storage"},
@@ -238,7 +238,7 @@ class TestParametersForm(MAASServerTestCase):
         )
         self.assertTrue(form.is_valid())
 
-    def test__validates_against_unsupported_parameter_types(self):
+    def test_validates_against_unsupported_parameter_types(self):
         unsupported_type = factory.make_name("unsupported")
         form = ParametersForm(data={"storage": {"type": unsupported_type}})
         self.assertFalse(form.is_valid())
@@ -252,14 +252,14 @@ class TestParametersForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__validates_unsupported_parameter_types_if_not_required(self):
+    def test_validates_unsupported_parameter_types_if_not_required(self):
         unsupported_type = factory.make_name("unsupported")
         form = ParametersForm(
             data={"storage": {"type": unsupported_type, "required": False}}
         )
         self.assertTrue(form.is_valid())
 
-    def test__validates_storage_interface_type_has_no_min_or_max(self):
+    def test_validates_storage_interface_type_has_no_min_or_max(self):
         ptype = random.choice(["storage", "interface"])
         form = ParametersForm(
             data={ptype: {"type": ptype, "min": random.randint(0, 1000)}}
@@ -269,7 +269,7 @@ class TestParametersForm(MAASServerTestCase):
             {"parameters": ["Type doesn't support min or max"]}, form.errors
         )
 
-    def test__validates_runtime_type_min_greater_than_zero(self):
+    def test_validates_runtime_type_min_greater_than_zero(self):
         form = ParametersForm(
             data={
                 "runtime": {"type": "runtime", "min": random.randint(-100, -1)}
@@ -281,7 +281,7 @@ class TestParametersForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__validates_min_less_than_max(self):
+    def test_validates_min_less_than_max(self):
         form = ParametersForm(
             data={
                 "runtime": {
@@ -296,7 +296,7 @@ class TestParametersForm(MAASServerTestCase):
             {"parameters": ["min must be less than max"]}, form.errors
         )
 
-    def test__input_errors_on_unknown_paramater(self):
+    def test_input_errors_on_unknown_paramater(self):
         script = factory.make_Script()
         bad_param = factory.make_name("bad_param")
         form = ParametersForm(
@@ -314,7 +314,7 @@ class TestParametersForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__input_runtime(self):
+    def test_input_runtime(self):
         script = factory.make_Script(
             parameters={"runtime": {"type": "runtime"}}
         )
@@ -329,7 +329,7 @@ class TestParametersForm(MAASServerTestCase):
             form.cleaned_data["input"][0],
         )
 
-    def test__input_runtime_gets_default_from_script_timeout(self):
+    def test_input_runtime_gets_default_from_script_timeout(self):
         script = factory.make_Script(
             parameters={"runtime": {"type": "runtime"}}
         )
@@ -341,7 +341,7 @@ class TestParametersForm(MAASServerTestCase):
             form.cleaned_data["input"][0],
         )
 
-    def test__input_runtime_requires_int(self):
+    def test_input_runtime_requires_int(self):
         script = factory.make_Script(
             parameters={"runtime": {"type": "runtime"}}
         )
@@ -353,7 +353,7 @@ class TestParametersForm(MAASServerTestCase):
         self.assertFalse(form.is_valid())
         self.assertDictEqual({"runtime": ["Must be an int"]}, form.errors)
 
-    def test__input_runtime_validates_required(self):
+    def test_input_runtime_validates_required(self):
         script = factory.make_Script(
             parameters={
                 "runtime": {
@@ -367,7 +367,7 @@ class TestParametersForm(MAASServerTestCase):
         self.assertFalse(form.is_valid())
         self.assertDictEqual({"runtime": ["Field is required"]}, form.errors)
 
-    def test__input_runtime_validates_min(self):
+    def test_input_runtime_validates_min(self):
         min_runtime = random.randint(1, 100)
         script = factory.make_Script(
             parameters={"runtime": {"type": "runtime", "min": min_runtime}}
@@ -381,7 +381,7 @@ class TestParametersForm(MAASServerTestCase):
             {"runtime": ["Must be greater than %s" % min_runtime]}, form.errors
         )
 
-    def test__input_runtime_validates_max(self):
+    def test_input_runtime_validates_max(self):
         max_runtime = random.randint(0, 100)
         script = factory.make_Script(
             parameters={"runtime": {"type": "runtime", "max": max_runtime}}
@@ -395,7 +395,7 @@ class TestParametersForm(MAASServerTestCase):
             {"runtime": ["Must be less than %s" % max_runtime]}, form.errors
         )
 
-    def test__input_storage_validates_required(self):
+    def test_input_storage_validates_required(self):
         script = factory.make_Script(
             parameters={
                 "storage": {
@@ -409,7 +409,7 @@ class TestParametersForm(MAASServerTestCase):
         self.assertFalse(form.is_valid())
         self.assertDictEqual({"storage": ["Field is required"]}, form.errors)
 
-    def test__input_storage_defaults_all_with_no_disks(self):
+    def test_input_storage_defaults_all_with_no_disks(self):
         script = factory.make_Script(
             parameters={
                 "runtime": {"type": "runtime"},
@@ -434,7 +434,7 @@ class TestParametersForm(MAASServerTestCase):
             form.cleaned_data["input"][0],
         )
 
-    def test__input_storage_all(self):
+    def test_input_storage_all(self):
         node = factory.make_Node()
         for _ in range(3):
             factory.make_PhysicalBlockDevice(node=node)
@@ -466,7 +466,7 @@ class TestParametersForm(MAASServerTestCase):
                 i["storage"]["value"],
             )
 
-    def test__input_storage_id(self):
+    def test_input_storage_id(self):
         node = factory.make_Node()
         for _ in range(3):
             factory.make_PhysicalBlockDevice(node=node)
@@ -497,7 +497,7 @@ class TestParametersForm(MAASServerTestCase):
             input[0]["storage"]["value"],
         )
 
-    def test__input_storage_id_errors(self):
+    def test_input_storage_id_errors(self):
         node = factory.make_Node()
         for _ in range(3):
             factory.make_PhysicalBlockDevice(node=node)
@@ -517,7 +517,7 @@ class TestParametersForm(MAASServerTestCase):
             {"storage": ["Physical block id does not exist"]}, form.errors
         )
 
-    def test__input_storage_list(self):
+    def test_input_storage_list(self):
         node = factory.make_Node()
         for _ in range(10):
             factory.make_PhysicalBlockDevice(node=node)
@@ -560,7 +560,7 @@ class TestParametersForm(MAASServerTestCase):
                 i["storage"]["value"],
             )
 
-    def test__input_storage_name_errors(self):
+    def test_input_storage_name_errors(self):
         node = factory.make_Node()
         for _ in range(3):
             factory.make_PhysicalBlockDevice(node=node)
@@ -586,7 +586,7 @@ class TestParametersForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__input_interface_validates_required(self):
+    def test_input_interface_validates_required(self):
         script = factory.make_Script(
             parameters={
                 "interface": {
@@ -600,7 +600,7 @@ class TestParametersForm(MAASServerTestCase):
         self.assertFalse(form.is_valid())
         self.assertDictEqual({"interface": ["Field is required"]}, form.errors)
 
-    def test__input_interface_defaults_all_with_no_nics(self):
+    def test_input_interface_defaults_all_with_no_nics(self):
         script = factory.make_Script(
             parameters={"interface": {"type": "interface"}}
         )
@@ -614,7 +614,7 @@ class TestParametersForm(MAASServerTestCase):
             form.cleaned_data["input"][0],
         )
 
-    def test__input_interface_defaults_boot_interface_during_commiss(self):
+    def test_input_interface_defaults_boot_interface_during_commiss(self):
         node = factory.make_Node_with_Interface_on_Subnet(
             status=NODE_STATUS.COMMISSIONING
         )
@@ -635,7 +635,7 @@ class TestParametersForm(MAASServerTestCase):
             form.cleaned_data["input"][0]["interface"]["value"],
         )
 
-    def test__input_interface_all(self):
+    def test_input_interface_all(self):
         node = factory.make_Node()
         subnet = factory.make_Subnet()
         usable_interfaces = [
@@ -672,7 +672,7 @@ class TestParametersForm(MAASServerTestCase):
                 i["interface"]["value"],
             )
 
-    def test__input_interface_all_only_includes_children(self):
+    def test_input_interface_all_only_includes_children(self):
         node = factory.make_Node(interface=False)
         subnet = factory.make_Subnet()
         bond = factory.make_Interface(
@@ -701,7 +701,7 @@ class TestParametersForm(MAASServerTestCase):
             input[0]["interface"]["value"],
         )
 
-    def test__input_interface_id(self):
+    def test_input_interface_id(self):
         node = factory.make_Node()
         subnet = factory.make_Subnet()
         for _ in range(3):
@@ -731,7 +731,7 @@ class TestParametersForm(MAASServerTestCase):
             input[0]["interface"]["value"],
         )
 
-    def test__input_interface_id_errors(self):
+    def test_input_interface_id_errors(self):
         node = factory.make_Node()
         for _ in range(3):
             factory.make_Interface(node=node)
@@ -748,7 +748,7 @@ class TestParametersForm(MAASServerTestCase):
             {"interface": ["Interface id does not exist"]}, form.errors
         )
 
-    def test__input_interface_id_errors_on_parent(self):
+    def test_input_interface_id_errors_on_parent(self):
         node = factory.make_Node(interface=False)
         parents = [factory.make_Interface(node=node) for _ in range(2)]
         factory.make_Interface(
@@ -767,7 +767,7 @@ class TestParametersForm(MAASServerTestCase):
             {"interface": ["Interface id does not exist"]}, form.errors
         )
 
-    def test__input_interface_id_errors_on_unconfigured_or_disabled(self):
+    def test_input_interface_id_errors_on_unconfigured_or_disabled(self):
         node = factory.make_Node()
         bad_interface = random.choice(
             [
@@ -783,7 +783,7 @@ class TestParametersForm(MAASServerTestCase):
         )
         self.assertFalse(form.is_valid())
 
-    def test__input_interface_list(self):
+    def test_input_interface_list(self):
         node = factory.make_Node()
         subnet = factory.make_Subnet()
         for _ in range(10):
@@ -826,7 +826,7 @@ class TestParametersForm(MAASServerTestCase):
                 i["interface"]["value"],
             )
 
-    def test__input_interface_name_errors(self):
+    def test_input_interface_name_errors(self):
         node = factory.make_Node()
         for _ in range(3):
             factory.make_Interface(node=node)
@@ -849,7 +849,7 @@ class TestParametersForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__input_interface_name_errors_on_parent(self):
+    def test_input_interface_name_errors_on_parent(self):
         node = factory.make_Node(interface=False)
         parents = [factory.make_Interface(node=node) for _ in range(2)]
         factory.make_Interface(
@@ -874,7 +874,7 @@ class TestParametersForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__input_interface_name_errors_on_unconfigured_or_disabled(self):
+    def test_input_interface_name_errors_on_unconfigured_or_disabled(self):
         node = factory.make_Node()
         bad_interface = random.choice(
             [
@@ -890,7 +890,7 @@ class TestParametersForm(MAASServerTestCase):
         )
         self.assertFalse(form.is_valid())
 
-    def test__input_url_validates_required(self):
+    def test_input_url_validates_required(self):
         script = factory.make_Script(
             parameters={"url": {"type": "url", "required": True}}
         )
@@ -898,13 +898,13 @@ class TestParametersForm(MAASServerTestCase):
         self.assertFalse(form.is_valid())
         self.assertDictEqual({"url": ["Field is required"]}, form.errors)
 
-    def test__input_url_defaults_empty_with_no_input(self):
+    def test_input_url_defaults_empty_with_no_input(self):
         script = factory.make_Script(parameters={"url": {"type": "url"}})
         form = ParametersForm(data={}, script=script, node=factory.make_Node())
         self.assertTrue(form.is_valid())
         self.assertDictEqual({}, form.cleaned_data["input"][0])
 
-    def test__input_url_allows_ipv4(self):
+    def test_input_url_allows_ipv4(self):
         script = factory.make_Script(parameters={"url": {"type": "url"}})
         input = factory.make_ipv4_address()
         form = ParametersForm(
@@ -916,7 +916,7 @@ class TestParametersForm(MAASServerTestCase):
             form.cleaned_data["input"][0],
         )
 
-    def test__input_url_allows_ipv4_url(self):
+    def test_input_url_allows_ipv4_url(self):
         script = factory.make_Script(parameters={"url": {"type": "url"}})
         input = "%s://%s:%d/%s" % (
             self.pick_scheme(),
@@ -933,7 +933,7 @@ class TestParametersForm(MAASServerTestCase):
             form.cleaned_data["input"][0],
         )
 
-    def test__input_url_allows_ipv6(self):
+    def test_input_url_allows_ipv6(self):
         script = factory.make_Script(parameters={"url": {"type": "url"}})
         input = factory.make_ipv6_address()
         form = ParametersForm(
@@ -945,7 +945,7 @@ class TestParametersForm(MAASServerTestCase):
             form.cleaned_data["input"][0],
         )
 
-    def test__input_url_allows_ipv6_url(self):
+    def test_input_url_allows_ipv6_url(self):
         script = factory.make_Script(parameters={"url": {"type": "url"}})
         input = "%s://[%s]:%d/%s" % (
             self.pick_scheme(),
@@ -962,7 +962,7 @@ class TestParametersForm(MAASServerTestCase):
             form.cleaned_data["input"][0],
         )
 
-    def test__input_url_allows_hostname(self):
+    def test_input_url_allows_hostname(self):
         script = factory.make_Script(parameters={"url": {"type": "url"}})
         input = factory.make_hostname()
         form = ParametersForm(
@@ -974,7 +974,7 @@ class TestParametersForm(MAASServerTestCase):
             form.cleaned_data["input"][0],
         )
 
-    def test__input_url_allows_hostname_url(self):
+    def test_input_url_allows_hostname_url(self):
         script = factory.make_Script(parameters={"url": {"type": "url"}})
         input = factory.make_url(scheme=self.pick_scheme())
         form = ParametersForm(
@@ -986,7 +986,7 @@ class TestParametersForm(MAASServerTestCase):
             form.cleaned_data["input"][0],
         )
 
-    def test__input_url_allows_list(self):
+    def test_input_url_allows_list(self):
         script = factory.make_Script(
             parameters={"url": {"type": "url", "allow_list": True}}
         )
@@ -1021,7 +1021,7 @@ class TestParametersForm(MAASServerTestCase):
             form.cleaned_data["input"][0],
         )
 
-    def test__input_url_list_requires_allow_list(self):
+    def test_input_url_list_requires_allow_list(self):
         script = factory.make_Script(parameters={"url": {"type": "url"}})
         inputs = ",".join(
             [
@@ -1051,7 +1051,7 @@ class TestParametersForm(MAASServerTestCase):
         self.assertFalse(form.is_valid())
         self.assertDictEqual({"url": ["Invalid URL"]}, form.errors)
 
-    def test__input_url_list_errors(self):
+    def test_input_url_list_errors(self):
         script = factory.make_Script(parameters={"url": {"type": "url"}})
         form = ParametersForm(
             data={"url": factory.make_name("bad!")},
diff --git a/src/maasserver/forms/tests/test_pods.py b/src/maasserver/forms/tests/test_pods.py
index 10828ad..2a349de 100644
--- a/src/maasserver/forms/tests/test_pods.py
+++ b/src/maasserver/forms/tests/test_pods.py
@@ -917,18 +917,18 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
         )
         return composed_machine, pod_hints
 
-    def test__requires_request_kwarg(self):
+    def test_requires_request_kwarg(self):
         error = self.assertRaises(ValueError, ComposeMachineForm)
         self.assertEqual("'request' kwargs is required.", str(error))
 
-    def test__requires_pod_kwarg(self):
+    def test_requires_pod_kwarg(self):
         request = MagicMock()
         error = self.assertRaises(
             ValueError, ComposeMachineForm, request=request
         )
         self.assertEqual("'pod' kwargs is required.", str(error))
 
-    def test__sets_up_fields_based_on_pod(self):
+    def test_sets_up_fields_based_on_pod(self):
         request = MagicMock()
         pod = make_pod_with_hints()
         form = ComposeMachineForm(request=request, pod=pod)
@@ -995,7 +995,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
             ),
         )
 
-    def test__sets_up_fields_based_on_pod_no_max_cpu_speed(self):
+    def test_sets_up_fields_based_on_pod_no_max_cpu_speed(self):
         request = MagicMock()
         pod = make_pod_with_hints()
         pod.hints.cpu_speed = 0
@@ -1014,7 +1014,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
             ),
         )
 
-    def test__sets_up_pool_default(self):
+    def test_sets_up_pool_default(self):
         request = MagicMock()
         pod = make_pod_with_hints()
         pool = factory.make_ResourcePool()
@@ -1023,7 +1023,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
         form = ComposeMachineForm(request=request, pod=pod)
         self.assertEqual(pool, form.initial["pool"])
 
-    def test__get_machine_uses_all_initial_values(self):
+    def test_get_machine_uses_all_initial_values(self):
         request = MagicMock()
         pod = make_pod_with_hints()
         form = ComposeMachineForm(data={}, request=request, pod=pod)
@@ -1060,7 +1060,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
             ),
         )
 
-    def test__get_machine_uses_passed_values(self):
+    def test_get_machine_uses_passed_values(self):
         request = MagicMock()
         pod = make_pod_with_hints()
         architecture = random.choice(pod.architectures)
@@ -1127,7 +1127,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
             ),
         )
 
-    def test__get_machine_handles_no_tags_in_storage(self):
+    def test_get_machine_handles_no_tags_in_storage(self):
         request = MagicMock()
         pod = make_pod_with_hints()
         disk_1 = random.randint(8, 16) * (1000 ** 3)
@@ -1168,7 +1168,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
             ),
         )
 
-    def test__get_machine_with_multiple_disks_fails_for_lxd_pods(self):
+    def test_get_machine_with_multiple_disks_fails_for_lxd_pods(self):
         request = MagicMock()
         pod_host = factory.make_Machine_with_Interface_on_Subnet()
         pod_host.boot_interface.vlan.dhcp_on = False
@@ -1191,7 +1191,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
         ):
             form.get_requested_machine(make_known_host_interfaces(pod))
 
-    def test__get_machine_with_interfaces_fails_no_dhcp_for_vlan(self):
+    def test_get_machine_with_interfaces_fails_no_dhcp_for_vlan(self):
         request = MagicMock()
         pod_host = factory.make_Machine_with_Interface_on_Subnet()
         pod_host.boot_interface.vlan.dhcp_on = False
@@ -1209,7 +1209,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
         ):
             form.get_requested_machine(make_known_host_interfaces(pod))
 
-    def test__get_machine_with_interfaces_fails_for_no_matching_network(self):
+    def test_get_machine_with_interfaces_fails_for_no_matching_network(self):
         request = MagicMock()
         pod = make_pod_with_hints(with_host=True)
         # Make a subnet that won't match the host via the constraint.
@@ -1224,7 +1224,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
         ):
             form.get_requested_machine(make_known_host_interfaces(pod))
 
-    def test__get_machine_with_interfaces_by_subnet(self):
+    def test_get_machine_with_interfaces_by_subnet(self):
         request = MagicMock()
         pod_host = factory.make_Machine_with_Interface_on_Subnet()
         space = factory.make_Space("dmz")
@@ -1270,7 +1270,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
             ),
         )
 
-    def test__get_machine_with_interfaces_with_empty_interfaces_input(self):
+    def test_get_machine_with_interfaces_with_empty_interfaces_input(self):
         request = MagicMock()
         host = factory.make_Machine_with_Interface_on_Subnet()
         space = factory.make_Space("dmz")
@@ -1307,7 +1307,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
             ),
         )
 
-    def test__get_machine_with_interfaces_with_unreserved_ip(self):
+    def test_get_machine_with_interfaces_with_unreserved_ip(self):
         # Mock the RPC client.
         client = MagicMock()
         mock_getClient = self.patch(pods_module, "getClientFromIdentifiers")
@@ -1376,7 +1376,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
             ),
         )
 
-    def test__get_machine_with_interfaces_by_subnet_with_default_mode(self):
+    def test_get_machine_with_interfaces_by_subnet_with_default_mode(self):
         request = MagicMock()
         pod_host = factory.make_Machine_with_Interface_on_Subnet()
         space = factory.make_Space("dmz")
@@ -1421,7 +1421,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
             ),
         )
 
-    def test__get_machine_with_interfaces_by_subnet_with_empty_mode(self):
+    def test_get_machine_with_interfaces_by_subnet_with_empty_mode(self):
         request = MagicMock()
         pod_host = factory.make_Machine_with_Interface_on_Subnet()
         space = factory.make_Space("dmz")
@@ -1468,7 +1468,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
             ),
         )
 
-    def test__get_machine_with_interfaces_by_space(self):
+    def test_get_machine_with_interfaces_by_space(self):
         request = MagicMock()
         pod_host = factory.make_Machine_with_Interface_on_Subnet()
         space = factory.make_Space("dmz")
@@ -1508,7 +1508,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
             ),
         )
 
-    def test__get_machine_with_interfaces_by_spaces(self):
+    def test_get_machine_with_interfaces_by_spaces(self):
         request = MagicMock()
         pod_host = factory.make_Machine_with_Interface_on_Subnet()
         dmz_space = factory.make_Space("dmz")
@@ -1562,7 +1562,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
             ),
         )
 
-    def test__get_machine_with_interfaces_by_subnets_bridge(self):
+    def test_get_machine_with_interfaces_by_subnets_bridge(self):
         request = MagicMock()
         cidr1 = "10.0.0.0/24"
         cidr2 = "192.168.100.0/24"
@@ -1623,7 +1623,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
             ),
         )
 
-    def test__get_machine_with_interfaces_by_subnets_bond(self):
+    def test_get_machine_with_interfaces_by_subnets_bond(self):
         request = MagicMock()
         cidr1 = "10.0.0.0/24"
         cidr2 = "192.168.100.0/24"
@@ -1689,7 +1689,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
             ),
         )
 
-    def test__get_machine_with_interfaces_by_subnets_bond_inside_bridge(self):
+    def test_get_machine_with_interfaces_by_subnets_bond_inside_bridge(self):
         request = MagicMock()
         cidr1 = "10.0.0.0/24"
         cidr2 = "192.168.100.0/24"
@@ -1762,7 +1762,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
             ),
         )
 
-    def test__get_machine_with_interfaces_by_space_as_bridge(self):
+    def test_get_machine_with_interfaces_by_space_as_bridge(self):
         request = MagicMock()
         pod_host = factory.make_Machine_with_Interface_on_Subnet(
             status=NODE_STATUS.READY
@@ -1807,7 +1807,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
             ),
         )
 
-    def test__get_machine_with_known_host_interfaces(self):
+    def test_get_machine_with_known_host_interfaces(self):
         # Need to test that it can actually find the pod host's data correctly
         # and that this matches what is expected.
         request = MagicMock()
@@ -1850,7 +1850,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
             ),
         )
 
-    def test__compose_with_interfaces_with_reserved_ip_fails(self):
+    def test_compose_with_interfaces_with_reserved_ip_fails(self):
         # Mock the RPC client.
         client = MagicMock()
         mock_getClient = self.patch(pods_module, "getClientFromIdentifiers")
@@ -1891,7 +1891,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
         with ExpectedException(StaticIPAddressUnavailable):
             form.compose()
 
-    def test__compose_with_interfaces_with_unreserved_ip(self):
+    def test_compose_with_interfaces_with_unreserved_ip(self):
         mock_post_commit_do = self.patch(pods_module, "post_commit_do")
         # Mock the RPC client.
         client = MagicMock()
@@ -1938,7 +1938,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
         self.assertThat(ip.get_interface().node, Equals(machine))
         self.assertThat(mock_post_commit_do, MockCalledOnce())
 
-    def test__compose_with_commissioning(self):
+    def test_compose_with_commissioning(self):
         mock_post_commit_do = self.patch(pods_module, "post_commit_do")
         request = MagicMock()
         pod = make_pod_with_hints()
@@ -1975,7 +1975,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
         self.assertThat(mock_commissioning, MockCalledOnce())
         self.assertThat(mock_post_commit_do, MockCalledOnce())
 
-    def test__compose_sends_default_storage_pool_id(self):
+    def test_compose_sends_default_storage_pool_id(self):
         mock_post_commit_do = self.patch(pods_module, "post_commit_do")
         request = MagicMock()
         pod = make_pod_with_hints()
@@ -2014,7 +2014,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
         )
         self.assertThat(mock_post_commit_do, MockCalledOnce())
 
-    def test__compose_duplicated_hostname(self):
+    def test_compose_duplicated_hostname(self):
         factory.make_Node(hostname="test")
 
         request = MagicMock()
@@ -2029,7 +2029,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
             form.errors,
         )
 
-    def test__compose_hostname_with_underscore(self):
+    def test_compose_hostname_with_underscore(self):
         request = MagicMock()
         pod = make_pod_with_hints()
 
@@ -2046,7 +2046,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
             form.errors,
         )
 
-    def test__compose_without_commissioning(self):
+    def test_compose_without_commissioning(self):
         mock_post_commit_do = self.patch(pods_module, "post_commit_do")
         request = MagicMock()
         pod = make_pod_with_hints()
@@ -2085,7 +2085,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
         self.assertThat(mock_commissioning, MockNotCalled())
         self.assertThat(mock_post_commit_do, MockCalledOnce())
 
-    def test__compose_with_skip_commissioning_passed(self):
+    def test_compose_with_skip_commissioning_passed(self):
         mock_post_commit_do = self.patch(pods_module, "post_commit_do")
         request = MagicMock()
         pod = make_pod_with_hints()
@@ -2122,7 +2122,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
         self.assertThat(mock_commissioning, MockNotCalled())
         self.assertThat(mock_post_commit_do, MockCalledOnce())
 
-    def test__compose_sets_domain_and_zone(self):
+    def test_compose_sets_domain_and_zone(self):
         mock_post_commit_do = self.patch(pods_module, "post_commit_do")
         request = MagicMock()
         pod = make_pod_with_hints()
@@ -2161,7 +2161,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
         )
         self.assertThat(mock_post_commit_do, MockCalledOnce())
 
-    def test__compose_sets_resource_pool(self):
+    def test_compose_sets_resource_pool(self):
         mock_post_commit_do = self.patch(pods_module, "post_commit_do")
         request = MagicMock()
         pod = make_pod_with_hints()
@@ -2189,7 +2189,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
         self.assertEqual(pool, created_machine.pool)
         self.assertThat(mock_post_commit_do, MockCalledOnce())
 
-    def test__compose_uses_pod_pool(self):
+    def test_compose_uses_pod_pool(self):
         mock_post_commit_do = self.patch(pods_module, "post_commit_do")
         request = MagicMock()
         pod = make_pod_with_hints()
@@ -2216,7 +2216,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
         self.assertEqual(pod.pool, created_machine.pool)
         self.assertThat(mock_post_commit_do, MockCalledOnce())
 
-    def test__compose_check_over_commit_ratios_raises_error_for_cores(self):
+    def test_compose_check_over_commit_ratios_raises_error_for_cores(self):
         request = MagicMock()
         pod = make_pod_with_hints()
         pod.cores = 0
@@ -2238,7 +2238,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
             str(error),
         )
 
-    def test__compose_check_over_commit_ratios_raises_error_for_memory(self):
+    def test_compose_check_over_commit_ratios_raises_error_for_memory(self):
         request = MagicMock()
         pod = make_pod_with_hints()
         pod.memory = 0
@@ -2265,7 +2265,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
             str(error),
         )
 
-    def test__compose_handles_timeout_error(self):
+    def test_compose_handles_timeout_error(self):
         request = MagicMock()
         pod = make_pod_with_hints()
 
@@ -2286,7 +2286,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
 
     @wait_for_reactor
     @inlineCallbacks
-    def test__compose_with_commissioning_in_reactor(self):
+    def test_compose_with_commissioning_in_reactor(self):
         request = MagicMock()
         pod = yield deferToDatabase(make_pod_with_hints, with_host=True)
         mock_request_commissioning_results = self.patch(
@@ -2344,7 +2344,7 @@ class TestComposeMachineForm(MAASTransactionServerTestCase):
         self.assertThat(mock_commissioning, MockCalledOnce())
         self.assertThat(mock_request_commissioning_results, MockCalledOnce())
 
-    def test__save_raises_AttributeError(self):
+    def test_save_raises_AttributeError(self):
         request = MagicMock()
         pod = make_pod_with_hints()
         form = ComposeMachineForm(data={}, request=request, pod=pod)
@@ -2372,18 +2372,18 @@ class TestComposeMachineForPodsForm(MAASServerTestCase):
     def make_pods(self):
         return [make_pod_with_hints() for _ in range(3)]
 
-    def test__requires_request_kwarg(self):
+    def test_requires_request_kwarg(self):
         error = self.assertRaises(ValueError, ComposeMachineForPodsForm)
         self.assertEqual("'request' kwargs is required.", str(error))
 
-    def test__requires_pods_kwarg(self):
+    def test_requires_pods_kwarg(self):
         request = MagicMock()
         error = self.assertRaises(
             ValueError, ComposeMachineForPodsForm, request=request
         )
         self.assertEqual("'pods' kwargs is required.", str(error))
 
-    def test__sets_up_pod_forms_based_on_pods(self):
+    def test_sets_up_pod_forms_based_on_pods(self):
         request = MagicMock()
         pods = self.make_pods()
         data = self.make_data(pods)
@@ -2406,7 +2406,7 @@ class TestComposeMachineForPodsForm(MAASServerTestCase):
             ),
         )
 
-    def test__save_raises_AttributeError(self):
+    def test_save_raises_AttributeError(self):
         request = MagicMock()
         pods = self.make_pods()
         data = self.make_data(pods)
@@ -2490,13 +2490,13 @@ class TestComposeMachineForPodsForm(MAASServerTestCase):
 
 
 class TestGetKnownHostInterfaces(MAASServerTestCase):
-    def test__returns_empty_list_if_no_interfaces(self):
+    def test_returns_empty_list_if_no_interfaces(self):
         node = factory.make_Machine_with_Interface_on_Subnet()
         node.interface_set.all().delete()
         interfaces = get_known_host_interfaces(node)
         self.assertThat(interfaces, HasLength(0))
 
-    def test__returns_appropriate_attach_type(self):
+    def test_returns_appropriate_attach_type(self):
         node = factory.make_Machine_with_Interface_on_Subnet()
         vlan = factory.make_VLAN(dhcp_on=False)
         node.interface_set.all().delete()
@@ -2523,7 +2523,7 @@ class TestGetKnownHostInterfaces(MAASServerTestCase):
             ],
         )
 
-    def test__behaves_correctly_when_vlan_is_none(self):
+    def test_behaves_correctly_when_vlan_is_none(self):
         node = factory.make_Machine_with_Interface_on_Subnet()
         node.interface_set.all().delete()
         bridge = factory.make_Interface(
@@ -2549,7 +2549,7 @@ class TestGetKnownHostInterfaces(MAASServerTestCase):
             ],
         )
 
-    def test__gets_dhcp_status_for_directly_enabled_vlan(self):
+    def test_gets_dhcp_status_for_directly_enabled_vlan(self):
         node = factory.make_Machine_with_Interface_on_Subnet()
         vlan = factory.make_VLAN(dhcp_on=True)
         node.interface_set.all().delete()
@@ -2576,7 +2576,7 @@ class TestGetKnownHostInterfaces(MAASServerTestCase):
             ],
         )
 
-    def test__gets_dhcp_status_for_indirectly_enabled_vlan(self):
+    def test_gets_dhcp_status_for_indirectly_enabled_vlan(self):
         node = factory.make_Machine_with_Interface_on_Subnet()
         relay_vlan = factory.make_VLAN(dhcp_on=True)
         vlan = factory.make_VLAN(dhcp_on=False, relay_vlan=relay_vlan)
diff --git a/src/maasserver/forms/tests/test_script.py b/src/maasserver/forms/tests/test_script.py
index ba9d743..3dbe295 100644
--- a/src/maasserver/forms/tests/test_script.py
+++ b/src/maasserver/forms/tests/test_script.py
@@ -34,17 +34,17 @@ from provisioningserver.events import AUDIT
 
 
 class TestScriptForm(MAASServerTestCase):
-    def test__create_requires_name(self):
+    def test_create_requires_name(self):
         form = ScriptForm(data={"script": factory.make_script_content()})
         self.assertFalse(form.is_valid())
         self.assertItemsEqual([], VersionedTextFile.objects.all())
 
-    def test__create_requires_script(self):
+    def test_create_requires_script(self):
         form = ScriptForm(data={"name": factory.make_string()})
         self.assertFalse(form.is_valid())
         self.assertItemsEqual([], VersionedTextFile.objects.all())
 
-    def test__create_with_default_values(self):
+    def test_create_with_default_values(self):
         name = factory.make_name("name")
         script_content = factory.make_script_content()
 
@@ -70,7 +70,7 @@ class TestScriptForm(MAASServerTestCase):
         self.assertFalse(script.may_reboot)
         self.assertFalse(script.recommission)
 
-    def test__create_with_defined_values(self):
+    def test_create_with_defined_values(self):
         name = factory.make_name("name")
         title = factory.make_name("title")
         description = factory.make_name("description")
@@ -144,7 +144,7 @@ class TestScriptForm(MAASServerTestCase):
         self.assertEquals(recommission, script.recommission)
         self.assertFalse(script.default)
 
-    def test__create_setting_default_has_no_effect(self):
+    def test_create_setting_default_has_no_effect(self):
         form = ScriptForm(
             data={
                 "name": factory.make_name("name"),
@@ -156,7 +156,7 @@ class TestScriptForm(MAASServerTestCase):
         script = form.save()
         self.assertFalse(script.default)
 
-    def test__update(self):
+    def test_update(self):
         script = factory.make_Script()
         name = factory.make_name("name")
         title = factory.make_name("title")
@@ -238,19 +238,19 @@ class TestScriptForm(MAASServerTestCase):
         )
         self.assertFalse(script.default)
 
-    def test__update_no_fields_mandatory(self):
+    def test_update_no_fields_mandatory(self):
         script = factory.make_Script()
         form = ScriptForm(data={}, instance=script)
         self.assertTrue(form.is_valid(), form.errors)
 
-    def test__update_setting_default_has_no_effect(self):
+    def test_update_setting_default_has_no_effect(self):
         script = factory.make_Script(default=True)
         form = ScriptForm(data={"default": False}, instance=script)
         self.assertTrue(form.is_valid(), form.errors)
         script = form.save()
         self.assertTrue(script.default)
 
-    def test__update_prohibits_most_field_updates_on_default_script(self):
+    def test_update_prohibits_most_field_updates_on_default_script(self):
         script = factory.make_Script(default=True)
         for name, field in ScriptForm.base_fields.items():
             if name in ["tags", "timeout"]:
@@ -279,7 +279,7 @@ class TestScriptForm(MAASServerTestCase):
             self.assertFalse(form.is_valid())
             self.assertEquals(1, VersionedTextFile.objects.all().count())
 
-    def test__update_edit_default_allows_update_of_all_fields(self):
+    def test_update_edit_default_allows_update_of_all_fields(self):
         script = factory.make_Script(default=True)
         for name, field in ScriptForm.base_fields.items():
             if name == "script_type":
@@ -309,7 +309,7 @@ class TestScriptForm(MAASServerTestCase):
             )
             self.assertTrue(form.is_valid(), form.errors)
 
-    def test__update_allows_editing_tag_and_timeout_on_default_script(self):
+    def test_update_allows_editing_tag_and_timeout_on_default_script(self):
         script = factory.make_Script(default=True, destructive=False)
         tags = [factory.make_name("tag") for _ in range(3)]
         timeout = random.randint(0, 1000)
@@ -324,7 +324,7 @@ class TestScriptForm(MAASServerTestCase):
         self.assertThat(script.tags, ContainsAll(tags))
         self.assertEquals(timedelta(0, timeout), script.timeout)
 
-    def test__update_requires_script_with_comment(self):
+    def test_update_requires_script_with_comment(self):
         script = factory.make_Script()
         form = ScriptForm(
             data={"comment": factory.make_name("comment")}, instance=script
@@ -340,7 +340,7 @@ class TestScriptForm(MAASServerTestCase):
             form.errors,
         )
 
-    def test__update_script_doesnt_effect_other_fields(self):
+    def test_update_script_doesnt_effect_other_fields(self):
         script = factory.make_Script()
         script_content = factory.make_script_content()
         name = script.name
@@ -381,7 +381,7 @@ class TestScriptForm(MAASServerTestCase):
         self.assertItemsEqual(for_hardware, script.for_hardware)
         self.assertEquals(recommission, script.recommission)
 
-    def test__yaml_doesnt_update_tags(self):
+    def test_yaml_doesnt_update_tags(self):
         script = factory.make_Script()
         orig_tags = script.tags
 
@@ -397,7 +397,7 @@ class TestScriptForm(MAASServerTestCase):
         script = form.save()
         self.assertItemsEqual(orig_tags, script.tags)
 
-    def test__yaml_doesnt_update_timeout(self):
+    def test_yaml_doesnt_update_timeout(self):
         script = factory.make_Script()
         orig_timeout = script.timeout
 
@@ -413,7 +413,7 @@ class TestScriptForm(MAASServerTestCase):
         script = form.save()
         self.assertEquals(orig_timeout, script.timeout)
 
-    def test__can_use_script_type_name(self):
+    def test_can_use_script_type_name(self):
         script_type = factory.pick_choice(SCRIPT_TYPE_CHOICES)
         form = ScriptForm(
             data={
@@ -427,7 +427,7 @@ class TestScriptForm(MAASServerTestCase):
 
         self.assertEquals(script_type, script.script_type)
 
-    def test__errors_on_invalid_script_type(self):
+    def test_errors_on_invalid_script_type(self):
         form = ScriptForm(
             data={
                 "name": factory.make_name("name"),
@@ -442,7 +442,7 @@ class TestScriptForm(MAASServerTestCase):
         )
         self.assertItemsEqual([], VersionedTextFile.objects.all())
 
-    def test__can_use_hardware_type_name(self):
+    def test_can_use_hardware_type_name(self):
         hardware_type = factory.pick_choice(HARDWARE_TYPE_CHOICES)
         form = ScriptForm(
             data={
@@ -456,7 +456,7 @@ class TestScriptForm(MAASServerTestCase):
 
         self.assertEquals(hardware_type, script.hardware_type)
 
-    def test__errors_on_invalid_hardware_type(self):
+    def test_errors_on_invalid_hardware_type(self):
         form = ScriptForm(
             data={
                 "name": factory.make_name("name"),
@@ -475,7 +475,7 @@ class TestScriptForm(MAASServerTestCase):
         )
         self.assertItemsEqual([], VersionedTextFile.objects.all())
 
-    def test__can_use_parallel(self):
+    def test_can_use_parallel(self):
         script_parallel = factory.pick_choice(SCRIPT_PARALLEL_CHOICES)
         form = ScriptForm(
             data={