diff --git a/tests/translate/convert/test_dtd2po.py b/tests/translate/convert/test_dtd2po.py
index 5e0ea67a97..d45f56ae62 100644
--- a/tests/translate/convert/test_dtd2po.py
+++ b/tests/translate/convert/test_dtd2po.py
@@ -283,8 +283,7 @@ def test_preserving_spaces(self):
         print(repr(unit.source))
         assert unit.source == " - with a newline and more text"
 
-    @staticmethod
-    def test_escaping_newline_tabs():
+    def test_escaping_newline_tabs(self):
         """Test that we handle all kinds of newline permutations."""
         dtdsource = '<!ENTITY  noupdatesfound.intro "A hard coded newline.\\nAnd tab\\t and a \\r carriage return.">\n'
         converter = dtd2po.dtd2po()
diff --git a/tests/translate/convert/test_po2oo.py b/tests/translate/convert/test_po2oo.py
index d852956282..6695e995d4 100644
--- a/tests/translate/convert/test_po2oo.py
+++ b/tests/translate/convert/test_po2oo.py
@@ -69,8 +69,7 @@ def test_convertoo(self):
         newoo = self.convertoo(posource, ootemplate, language="zu")
         assert newoo.decode("utf-8") == ootemplate + ooexpected
 
-    @staticmethod
-    def test_pofilter():
+    def test_pofilter(self):
         """Tests integration with pofilter."""
         # Some bad po with a few errors:
         posource = b'#: sourcefile.bla#ID_NUMBER.txet.gnirts\nmsgid "<tag cow=\\"3\\">Mistake."\nmsgstr "  <etiket koei=\\"3\\">(fout) "'
@@ -114,8 +113,7 @@ def test_roundtrip_spaces(self):
         self.check_roundtrip(" ")
         self.check_roundtrip("\u00a0")
 
-    @staticmethod
-    def test_default_timestamp():
+    def test_default_timestamp(self):
         """Test to ensure that we revert to the default timestamp."""
         oointro, oooutro = (
             r"svx	source\dialog\numpages.src	0	string	RID_SVXPAGE_NUM_OPTIONS	STR_BULLET			0	en-US	Text				",
@@ -133,8 +131,7 @@ def test_default_timestamp():
             == oointro + "2002-02-02 02:02:02" + oooutro
         )
 
-    @staticmethod
-    def test_escape_conversion():
+    def test_escape_conversion(self):
         """Test to ensure that we convert escapes correctly."""
         oosource = (
             r"svx	source\dialog\numpages.src	0	string	RID_SVXPAGE_NUM_OPTIONS	STR_BULLET			0	en-US	Column1\tColumn2\r\n				2002-02-02 02:02:02"
@@ -149,8 +146,7 @@ def test_escape_conversion():
         )
         assert b"\tKolom1\\tKolom2\\r\\n\t" in outputfile.getvalue()
 
-    @staticmethod
-    def test_helpcontent_escapes():
+    def test_helpcontent_escapes(self):
         """Test to ensure that we convert helpcontent escapes correctly."""
         # Note how this test specifically uses incorrect spacing in the
         # translation. The extra space before 'hid' and an extra space before
@@ -178,8 +174,7 @@ def test_helpcontent_escapes():
             in outputfile.getvalue()
         )
 
-    @staticmethod
-    def test_helpcontent_escapes2():
+    def test_helpcontent_escapes2(self):
         """Test to ensure that we convert helpcontent escapes correctly."""
         oosource = (
             r"helpcontent2	source\text\scalc\05\empty_cells.xhp	0	help	par_id2629474				0	en-US	A1: <empty>				2002-02-02 02:02:02"
diff --git a/tests/translate/convert/test_po2php.py b/tests/translate/convert/test_po2php.py
index 8b24718cf3..33d20b91e5 100644
--- a/tests/translate/convert/test_po2php.py
+++ b/tests/translate/convert/test_po2php.py
@@ -29,8 +29,7 @@ def merge2php(phpsource, posource):
         print(outputphp)
         return outputphp
 
-    @staticmethod
-    def test_convertphp():
+    def test_convertphp(self):
         """Test convertphp helper."""
         posource = """#: $lang['name']
 msgid "value"
@@ -47,8 +46,7 @@ def test_convertphp():
         assert po2php.convertphp(inputfile, outputfile, templatefile) == 1
         assert outputfile.getvalue() == phpexpected
 
-    @staticmethod
-    def test_convertphp_notemplate():
+    def test_convertphp_notemplate(self):
         """Test convertphp helper without template."""
         posource = """#: $lang['name']
 msgid "value"
@@ -59,8 +57,7 @@ def test_convertphp_notemplate():
         with raises(ValueError):
             po2php.convertphp(inputfile, outputfile, None)
 
-    @staticmethod
-    def test_convertphp_empty_template():
+    def test_convertphp_empty_template(self):
         """Test convertphp helper with empty translation."""
         posource = """#: $lang['name']
 msgid "value"
diff --git a/tests/translate/lang/test_identify.py b/tests/translate/lang/test_identify.py
index 5b3ac50c9d..53fc33c541 100644
--- a/tests/translate/lang/test_identify.py
+++ b/tests/translate/lang/test_identify.py
@@ -173,8 +173,7 @@ def test_identify_store(self):
             unit.target = TEXT_LIST[i]
         assert self.langident.identify_target_lang(langlist) == "de"
 
-    @staticmethod
-    def test_bad_init_data():
+    def test_bad_init_data(self):
         """Test __init__ with bad conf files and data dirs."""
         with raises(ValueError):
             LanguageIdentifier(model_dir="missing")
diff --git a/tests/translate/misc/test_multistring.py b/tests/translate/misc/test_multistring.py
index c87454fc38..9168ca2867 100644
--- a/tests/translate/misc/test_multistring.py
+++ b/tests/translate/misc/test_multistring.py
@@ -4,8 +4,7 @@
 
 
 class TestMultistring:
-    @staticmethod
-    def test_constructor():
+    def test_constructor(self):
         t = multistring.multistring
         s1 = t("test")
         assert type(s1) is t
@@ -19,8 +18,7 @@ def test_constructor():
         with pytest.raises(ValueError):
             t([])
 
-    @staticmethod
-    def test_repr():
+    def test_repr(self):
         t = multistring.multistring
         s1 = t("test")
         assert repr(s1) == "multistring(['test'])"
@@ -30,8 +28,7 @@ def test_repr():
         assert repr(s2) == "multistring(['test', 'mé'])"
         assert eval("multistring.%s" % repr(s2)) == s2
 
-    @staticmethod
-    def test_replace():
+    def test_replace(self):
         t = multistring.multistring
         s1 = t(["abcdef", "def"])
 
@@ -62,8 +59,7 @@ def test_replace():
         result = s2.replace("e", "g", 1)
         assert result == t(["abcdgef", "dgef"])
 
-    @staticmethod
-    def test_comparison():
+    def test_comparison(self):
         t = multistring.multistring
         assert t("test") == "test"
         assert t("test").__cmp__("test") == 0
@@ -72,14 +68,12 @@ def test_comparison():
         assert t("téßt") > "test"
         assert t("téßt").__cmp__("test") > 0
 
-    @staticmethod
-    def test_coercion():
+    def test_coercion(self):
         t = multistring.multistring
         assert str(t("test")) == "test"
         assert str(t("téßt")) == "téßt"
 
-    @staticmethod
-    def test_unicode_coercion():
+    def test_unicode_coercion(self):
         t = multistring.multistring
         assert str(t("test")) == "test"
         assert str(t("test")) == "test"
@@ -88,14 +82,12 @@ def test_unicode_coercion():
         assert str(t(["téßt", "blāh"])) == "téßt"
         assert str(t(["téßt"])) == "téßt"
 
-    @staticmethod
-    def test_list_coercion():
+    def test_list_coercion(self):
         t = multistring.multistring
         assert str([t("test")]) == "[multistring(['test'])]"
         assert str([t("tést")]) == "[multistring(['tést'])]"
 
-    @staticmethod
-    def test_multistring_hash():
+    def test_multistring_hash(self):
         t = multistring.multistring
         foo = t(["foo", "bar"])
         foodict = {foo: "baz"}
diff --git a/tests/translate/misc/test_optrecurse.py b/tests/translate/misc/test_optrecurse.py
index 8dbe095467..ce14539571 100644
--- a/tests/translate/misc/test_optrecurse.py
+++ b/tests/translate/misc/test_optrecurse.py
@@ -17,8 +17,7 @@ def test_splitext(self):
         print(fullpath)
         assert self.parser.splitext(fullpath) == (root, extension)
 
-    @staticmethod
-    def test_outputfile_receives_bytes(capsys):
+    def test_outputfile_receives_bytes(self, capsys):
         parser = optrecurse.RecursiveOptionParser({"txt": ("po", None)})
 
         temp_file = NamedTemporaryFile(delete=False)
diff --git a/tests/translate/misc/test_quote.py b/tests/translate/misc/test_quote.py
index 3d056c0431..9180055db6 100644
--- a/tests/translate/misc/test_quote.py
+++ b/tests/translate/misc/test_quote.py
@@ -108,40 +108,34 @@ def test_stripcomment():
 
 
 class TestEncoding:
-    @staticmethod
-    def test_javapropertiesencode():
+    def test_javapropertiesencode(self):
         assert quote.javapropertiesencode("abc") == "abc"
         assert quote.javapropertiesencode("abcḓ") == r"abc\u1E13"
         assert quote.javapropertiesencode("abc\n") == "abc\\n"
 
-    @staticmethod
-    def test_java_utf8_properties_encode():
+    def test_java_utf8_properties_encode(self):
         assert quote.java_utf8_properties_encode("abc") == "abc"
         assert quote.java_utf8_properties_encode("abcḓ") == "abcḓ"
         assert quote.java_utf8_properties_encode("abc\n") == "abc\\n"
 
-    @staticmethod
-    def test_escapespace():
+    def test_escapespace(self):
         assert quote.escapespace(" ") == "\\u0020"
         assert quote.escapespace("\t") == "\\u0009"
 
-    @staticmethod
-    def test_mozillaescapemarginspaces():
+    def test_mozillaescapemarginspaces(self):
         assert quote.mozillaescapemarginspaces(" ") == r"\u0020"
         assert quote.mozillaescapemarginspaces("A") == "A"
         assert quote.mozillaescapemarginspaces(" abc ") == r"\u0020abc\u0020"
         assert quote.mozillaescapemarginspaces("  abc ") == r"\u0020 abc\u0020"
 
-    @staticmethod
-    def test_mozilla_control_escapes():
+    def test_mozilla_control_escapes(self):
         r"""Test that we do \uNNNN escapes for certain control characters instead of converting to UTF-8 characters."""
         prefix, suffix = "bling", "blang"
         for control in ("\u0005", "\u0006", "\u0007", "\u0011"):
             string = prefix + control + suffix
             assert quote.escapecontrols(string) != string
 
-    @staticmethod
-    def test_propertiesdecode():
+    def test_propertiesdecode(self):
         assert quote.propertiesdecode("abc") == "abc"
         assert quote.propertiesdecode("abc\\u1e13") == "abcḓ"
         assert quote.propertiesdecode("abc\\u1E13") == "abcḓ"
@@ -149,8 +143,7 @@ def test_propertiesdecode():
         assert quote.propertiesdecode("abc\\") == "abc\\"
         assert quote.propertiesdecode("abc\\") == "abc\\"
 
-    @staticmethod
-    def test_controlchars():
+    def test_controlchars(self):
         assert quote.javapropertiesencode(quote.propertiesdecode("\u0001")) == r"\u0001"
         assert quote.javapropertiesencode(quote.propertiesdecode("\\u01")) == r"\u0001"
         assert quote.javapropertiesencode("\\") == "\\\\"
@@ -158,8 +151,7 @@ def test_controlchars():
         assert quote.propertiesdecode("\x01") == "\x01"
         assert quote.propertiesdecode("\\u0001") == "\x01"
 
-    @staticmethod
-    def test_properties_decode_slashu():
+    def test_properties_decode_slashu(self):
         # The real input strings don't have double backslashes, but we have to
         # double them here because Python immediately decode them, even for raw
         # strings.
@@ -180,8 +172,7 @@ def test_htmlencoding(self):
         raw_encoded = [("€", "&euro;"), ("©", "&copy;"), ('"', "&quot;")]
         self._html_encoding_helper(raw_encoded)
 
-    @staticmethod
-    def test_htmlencoding_existing_entities():
+    def test_htmlencoding_existing_entities(self):
         """Test that we don't mess existing entities."""
         assert quote.htmlentityencode("&amp;") == "&amp;"
 
@@ -192,8 +183,7 @@ def test_htmlencoding_passthrough(self):
         ]  # Raw text should have nothing done to it.
         self._html_encoding_helper(raw_encoded)
 
-    @staticmethod
-    def test_htmlencoding_nonentities():
+    def test_htmlencoding_nonentities(self):
         """Tests to give us full coverage."""
         for encoded, real in [
             ("Some &; text", "Some &; text"),
diff --git a/tests/translate/search/test_lshtein.py b/tests/translate/search/test_lshtein.py
index 9f331f691d..fa79c995a6 100644
--- a/tests/translate/search/test_lshtein.py
+++ b/tests/translate/search/test_lshtein.py
@@ -4,8 +4,7 @@
 class TestLevenshtein:
     """Test whether Levenshtein distance calculations are correct."""
 
-    @staticmethod
-    def test_basic_distance():
+    def test_basic_distance(self):
         """Tests distance correctness with a few basic values."""
         assert lshtein.distance("word", "word") == 0
         assert lshtein.distance("word", "") == 4
@@ -14,8 +13,7 @@ def test_basic_distance():
         assert lshtein.distance("words", "word") == 1
         assert lshtein.distance("word", "woord") == 1
 
-    @staticmethod
-    def test_basic_similarity():
+    def test_basic_similarity(self):
         """Tests similarity correctness with a few basic values."""
         levenshtein = lshtein.LevenshteinComparer()
         assert levenshtein.similarity("word", "word") == 100
@@ -23,8 +21,7 @@ def test_basic_similarity():
         assert levenshtein.similarity("word", "wood") == 75
         assert levenshtein.similarity("aaa", "bbb", 0) == 0
 
-    @staticmethod
-    def test_long_similarity():
+    def test_long_similarity(self):
         """Tests that very long strings are handled well."""
         # A sentence with 240 characters:
         sentence = "A long, dreary sentence about a cow that never new his mother. Actually it didn't known its father either. One day he decided that enough is enough, and that he would stop making long, dreary sentences just for the sake of making sentences."
diff --git a/tests/translate/search/test_terminology.py b/tests/translate/search/test_terminology.py
index da044e7ab4..217f211336 100644
--- a/tests/translate/search/test_terminology.py
+++ b/tests/translate/search/test_terminology.py
@@ -4,8 +4,7 @@
 class TestTerminology:
     """Test terminology matching."""
 
-    @staticmethod
-    def test_basic():
+    def test_basic(self):
         """Tests basic functionality."""
         termmatcher = terminology.TerminologyComparer()
         assert termmatcher.similarity("Open the file", "file") > 75
diff --git a/tests/translate/storage/placeables/test_base.py b/tests/translate/storage/placeables/test_base.py
index e19431638f..2829c2cdff 100644
--- a/tests/translate/storage/placeables/test_base.py
+++ b/tests/translate/storage/placeables/test_base.py
@@ -182,8 +182,7 @@ def test_isleaf(self):
         for child in self.elem.sub:
             assert child.isleaf()
 
-    @staticmethod
-    def test_prune():
+    def test_prune(self):
         elem = StringElem("foo")
         child = StringElem("bar")
         elem.sub.append(child)
diff --git a/tests/translate/storage/test_factory.py b/tests/translate/storage/test_factory.py
index 74aaaacfb2..437bc70eb3 100644
--- a/tests/translate/storage/test_factory.py
+++ b/tests/translate/storage/test_factory.py
@@ -44,8 +44,7 @@ def cleardir(dirname):
             os.rmdir(dirname)
         assert not os.path.exists(dirname)
 
-    @staticmethod
-    def test_getclass():
+    def test_getclass(self):
         assert classname("file.po") == "pofile"
         assert classname("file.pot") == "pofile"
         assert classname("file.dtd.po") == "pofile"
diff --git a/tests/translate/storage/test_fluent.py b/tests/translate/storage/test_fluent.py
index 0a92532741..f386217884 100644
--- a/tests/translate/storage/test_fluent.py
+++ b/tests/translate/storage/test_fluent.py
@@ -3442,8 +3442,7 @@ def test_parse_errors(self):
             r"message = { -ref",
         )
 
-    @staticmethod
-    def test_unit_ids():
+    def test_unit_ids(self):
         """Test that setting valid ids is ok, and invalid ids are blocked."""
         # Test valid ids.
         for fluent_type, unit_id in [
diff --git a/tests/translate/storage/test_html.py b/tests/translate/storage/test_html.py
index 65ce2aa296..483f6b969f 100644
--- a/tests/translate/storage/test_html.py
+++ b/tests/translate/storage/test_html.py
@@ -57,14 +57,12 @@ def test_mismatched_tags(self):
                 """<table summary="This is the summary"><caption>A caption</caption><thead><tr><th abbr="Head 1">Heading One</th><th>Heading Two</th></thead><tfoot><tr><td>Foot One</td><td>Foot Two</td></tr></tfoot><tbody><tr><td>One</td><td>Two</td></tr></tbody></table>"""
             )
 
-    @staticmethod
-    def test_self_closing_tags():
+    def test_self_closing_tags(self):
         h = html.htmlfile()
         store = h.parsestring("<h3>Some text <img><br><img></h3>")
         assert len(store.units) == 1
 
-    @staticmethod
-    def test_escaping_script_and_pre():
+    def test_escaping_script_and_pre(self):
         """
         <script> and <pre> can contain < and > and these should not be
         interpretted as tags.
@@ -123,8 +121,7 @@ def test_strip_html(self):
             == "Firefox for Desktop"
         )
 
-    @staticmethod
-    def test_extraction_tag_figcaption():
+    def test_extraction_tag_figcaption(self):
         """Check that we can extract figcaption."""
         h = html.htmlfile()
         # Example form http://www.w3schools.com/tags/tag_figcaption.asp
@@ -140,8 +137,7 @@ def test_extraction_tag_figcaption():
         assert store.units[0].source == "The Pulpit Rock"
         assert store.units[1].source == "Fig1. - A view of the pulpit rock in Norway."
 
-    @staticmethod
-    def test_extraction_tag_caption_td_th():
+    def test_extraction_tag_caption_td_th(self):
         """Check that we can extract table related translatable: th, td and caption."""
         h = html.htmlfile()
         # Example form http://www.w3schools.com/tags/tag_caption.asp
@@ -167,8 +163,7 @@ def test_extraction_tag_caption_td_th():
         assert store.units[3].source == "January"
         assert store.units[4].source == "$100"
 
-    @staticmethod
-    def test_extraction_attr_alt():
+    def test_extraction_attr_alt(self):
         """Check that we can extract title attribute."""
         h = html.htmlfile()
         # Example from http://www.netmechanic.com/news/vol6/html_no1.htm
@@ -182,8 +177,7 @@ def test_extraction_attr_alt():
             store.units[0].source == "UAHC campers enjoy a meal in the camp cafeteria"
         )
 
-    @staticmethod
-    def test_extraction_attr_title():
+    def test_extraction_attr_title(self):
         """Check that we can extract title attribute."""
         h = html.htmlfile()
 
@@ -228,8 +222,7 @@ def test_extraction_attr_title():
         assert len(store.units) == 1
         assert store.units[0].source == "Henry Jacobs camper application"
 
-    @staticmethod
-    def test_extraction_pre():
+    def test_extraction_pre(self):
         """Check that we can preserve lines in the <pre> tag."""
         h = html.htmlfile()
         store = h.parsestring(
@@ -244,8 +237,7 @@ def test_extraction_pre():
         assert len(store.units) == 1
         assert store.units[0].source == "this is\na multiline\npre tag"
 
-    @staticmethod
-    def test_extraction_pre_code():
+    def test_extraction_pre_code(self):
         """Check that we can preserve lines in the <pre> tag."""
         h = html.htmlfile()
         store = h.parsestring(
diff --git a/tests/translate/storage/test_pypo.py b/tests/translate/storage/test_pypo.py
index 8b61e75051..ad0649ecfb 100644
--- a/tests/translate/storage/test_pypo.py
+++ b/tests/translate/storage/test_pypo.py
@@ -10,8 +10,7 @@
 
 
 class TestHelpers:
-    @staticmethod
-    def test_unescape():
+    def test_unescape(self):
         assert pypo.unescape(r"koei") == "koei"
         assert pypo.unescape(r"koei\n") == "koei\n"
         assert pypo.unescape(r"koei\\") == "koei\\"
@@ -28,8 +27,7 @@ def test_unescape():
         assert pypo.unescape(r"\"\\koei\"\\") == '"\\koei"\\'
         assert pypo.unescape(r"\\\rkoei\r\\") == "\\\rkoei\r\\"
 
-    @staticmethod
-    def test_quoteforpo():
+    def test_quoteforpo(self):
         """Special escaping routine to manage newlines and linewrap in PO."""
         # Simple case
         assert pypo.quoteforpo("Some test") == ['"Some test"']
@@ -75,8 +73,7 @@ def test_quoteforpo():
             '"obhucabhuca ukudibanisa kwakho.</b>"',
         ]
 
-    @staticmethod
-    def test_quoteforpo_escaped_quotes():
+    def test_quoteforpo_escaped_quotes(self):
         r"""
         Ensure that we don't break \" in two when wrapping.
 
diff --git a/tests/translate/storage/test_qph.py b/tests/translate/storage/test_qph.py
index fa739e3dc9..b7a587105c 100644
--- a/tests/translate/storage/test_qph.py
+++ b/tests/translate/storage/test_qph.py
@@ -58,8 +58,7 @@ def test_basic(self):
         assert newfile.findunit("Bla").source == "Bla"
         assert newfile.findunit("dit") is None
 
-    @staticmethod
-    def test_source():
+    def test_source(self):
         qphfile = qph.QphFile()
         qphunit = qphfile.addsourceunit("Concept")
         qphunit.source = "Term"
@@ -68,8 +67,7 @@ def test_source():
         assert newfile.findunit("Concept") is None
         assert newfile.findunit("Term") is not None
 
-    @staticmethod
-    def test_target():
+    def test_target(self):
         qphfile = qph.QphFile()
         qphunit = qphfile.addsourceunit("Concept")
         qphunit.target = "Konsep"
@@ -77,8 +75,7 @@ def test_target():
         print(bytes(qphfile))
         assert newfile.findunit("Concept").target == "Konsep"
 
-    @staticmethod
-    def test_language():
+    def test_language(self):
         """Check that we can get and set language and sourcelanguage in the header."""
         qphstr = """<!DOCTYPE QPH>
 <QPH language="fr" sourcelanguage="de">
diff --git a/tests/translate/storage/test_tbx.py b/tests/translate/storage/test_tbx.py
index e2ed43d7d1..56fcad9f7d 100644
--- a/tests/translate/storage/test_tbx.py
+++ b/tests/translate/storage/test_tbx.py
@@ -10,8 +10,7 @@ class TestTBXUnit(test_base.TestTranslationUnit):
 class TestTBXfile(test_base.TestTranslationStore):
     StoreClass = tbx.tbxfile
 
-    @staticmethod
-    def test_basic():
+    def test_basic(self):
         tbxfile = tbx.tbxfile()
         assert tbxfile.units == []
         tbxfile.addsourceunit("Bla")
@@ -23,8 +22,7 @@ def test_basic():
         assert newfile.findunit("Bla").source == "Bla"
         assert newfile.findunit("dit") is None
 
-    @staticmethod
-    def test_source():
+    def test_source(self):
         tbxfile = tbx.tbxfile()
         tbxunit = tbxfile.addsourceunit("Concept")
         tbxunit.source = "Term"
@@ -33,8 +31,7 @@ def test_source():
         assert newfile.findunit("Concept") is None
         assert newfile.findunit("Term") is not None
 
-    @staticmethod
-    def test_target():
+    def test_target(self):
         tbxfile = tbx.tbxfile()
         tbxunit = tbxfile.addsourceunit("Concept")
         tbxunit.target = "Konsep"
@@ -42,8 +39,7 @@ def test_target():
         print(bytes(tbxfile))
         assert newfile.findunit("Concept").target == "Konsep"
 
-    @staticmethod
-    def test_setid():
+    def test_setid(self):
         tbxfile = tbx.tbxfile()
         tbxunit = tbxfile.addsourceunit("Concept")
         tbxunit.setid("testid")
@@ -51,8 +47,7 @@ def test_setid():
         print(bytes(tbxfile))
         assert newfile.findunit("Concept").getid() == "testid"
 
-    @staticmethod
-    def test_indent():
+    def test_indent(self):
         tbxfile = tbx.tbxfile()
         tbxunit = tbxfile.addsourceunit("Concept")
         tbxunit.setid("testid")
@@ -79,8 +74,7 @@ def test_indent():
 """
         )
 
-    @staticmethod
-    def test_descrip():
+    def test_descrip(self):
         tbxdata = """<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE martif PUBLIC "ISO 12200:1999A//DTD MARTIF core (DXFcdV04)//EN" "TBXcdv04.dtd">
 <martif type="TBX" xml:lang="en">
@@ -112,8 +106,7 @@ def test_descrip():
             "Explanation", "Another explanation"
         )
 
-    @staticmethod
-    def test_note_from():
+    def test_note_from(self):
         tbxdata = """<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE martif PUBLIC "ISO 12200:1999A//DTD MARTIF core (DXFcdV04)//EN" "TBXcdv04.dtd">
 <martif type="TBX" xml:lang="en">
diff --git a/tests/translate/storage/test_tiki.py b/tests/translate/storage/test_tiki.py
index 47ef519438..f25f4cda57 100644
--- a/tests/translate/storage/test_tiki.py
+++ b/tests/translate/storage/test_tiki.py
@@ -7,16 +7,14 @@
 
 
 class TestTikiUnit:
-    @staticmethod
-    def test_locations():
+    def test_locations(self):
         unit = tiki.TikiUnit("one")
         unit.addlocation("blah")
         assert unit.getlocations() == []
         unit.addlocation("unused")
         assert unit.getlocations() == ["unused"]
 
-    @staticmethod
-    def test_to_unicode():
+    def test_to_unicode(self):
         unit = tiki.TikiUnit("one")
         unit.target = "two"
         assert str(unit) == '"one" => "two",\n'
@@ -28,24 +26,21 @@ def test_to_unicode():
 
 
 class TestTikiStore:
-    @staticmethod
-    def test_parse_simple():
+    def test_parse_simple(self):
         tikisource = rb'"Top authors" => "Top autoren",'
         tikifile = tiki.TikiStore(tikisource)
         assert len(tikifile.units) == 1
         assert tikifile.units[0].source == "Top authors"
         assert tikifile.units[0].target == "Top autoren"
 
-    @staticmethod
-    def test_parse_encode():
+    def test_parse_encode(self):
         """Make sure these tiki special symbols come through correctly."""
         tikisource = rb'"test: |\n \r \t \\ \$ \"|" => "test: |\n \r \t \\ \$ \"|",'
         tikifile = tiki.TikiStore(tikisource)
         assert tikifile.units[0].source == r"test: |\n \r \t \\ \$ \"|"
         assert tikifile.units[0].target == r"test: |\n \r \t \\ \$ \"|"
 
-    @staticmethod
-    def test_parse_locations():
+    def test_parse_locations(self):
         """
         This function will test to make sure the location matching is working.  It
         tests that locations are detected, the default "translated" case, and that
@@ -76,8 +71,7 @@ def test_parse_locations():
         assert tikifile.units[5].location == ["possiblyuntranslated"]
         assert tikifile.units[6].location == ["translated"]
 
-    @staticmethod
-    def test_parse_ignore_extras():
+    def test_parse_ignore_extras(self):
         """Tests that we ignore extraneous lines."""
         tikisource = b"""<?php
 $lang = Array(
diff --git a/tests/translate/storage/test_tmx.py b/tests/translate/storage/test_tmx.py
index f9a800d7c5..b959d26c68 100644
--- a/tests/translate/storage/test_tmx.py
+++ b/tests/translate/storage/test_tmx.py
@@ -77,8 +77,7 @@ def test_withnewlines(self):
         print(bytes(tmxfile))
         assert newfile.translate("First line\nSecond line") == "Eerste lyn\nTweede lyn"
 
-    @staticmethod
-    def test_xmlentities():
+    def test_xmlentities(self):
         """Test that the xml entities '&' and '<'  are escaped correctly."""
         tmxfile = tmx.tmxfile()
         tmxfile.addtranslation("Mail & News", "en", "Nuus & pos", "af")
diff --git a/tests/translate/storage/test_ts.py b/tests/translate/storage/test_ts.py
index a4e200260e..0b6119fdb0 100644
--- a/tests/translate/storage/test_ts.py
+++ b/tests/translate/storage/test_ts.py
@@ -2,7 +2,6 @@
 
 
 class TestTS:
-    @staticmethod
-    def test_construct():
+    def test_construct(self):
         tsfile = ts.QtTsParser()
         tsfile.addtranslation("ryan", "Bread", "Brood", "Wit", createifmissing=True)
diff --git a/tests/translate/storage/test_ts2.py b/tests/translate/storage/test_ts2.py
index b00effbd12..f7429f02b6 100644
--- a/tests/translate/storage/test_ts2.py
+++ b/tests/translate/storage/test_ts2.py
@@ -139,8 +139,7 @@ class TestTSUnit(test_base.TestTranslationUnit):
 class TestTSfile(test_base.TestTranslationStore):
     StoreClass = ts.tsfile
 
-    @staticmethod
-    def test_basic():
+    def test_basic(self):
         tsfile = ts.tsfile()
         assert tsfile.units == []
         tsfile.addsourceunit("Bla")
@@ -152,8 +151,7 @@ def test_basic():
         assert newfile.findunit("Bla").source == "Bla"
         assert newfile.findunit("dit") is None
 
-    @staticmethod
-    def test_source():
+    def test_source(self):
         tsfile = ts.tsfile()
         tsunit = tsfile.addsourceunit("Concept")
         tsunit.source = "Term"
@@ -162,8 +160,7 @@ def test_source():
         assert newfile.findunit("Concept") is None
         assert newfile.findunit("Term") is not None
 
-    @staticmethod
-    def test_target():
+    def test_target(self):
         tsfile = ts.tsfile()
         tsunit = tsfile.addsourceunit("Concept")
         tsunit.target = "Konsep"
@@ -171,8 +168,7 @@ def test_target():
         print(bytes(tsfile))
         assert newfile.findunit("Concept").target == "Konsep"
 
-    @staticmethod
-    def test_plurals():
+    def test_plurals(self):
         """Test basic plurals."""
         tsfile = ts.tsfile()
         tsunit = tsfile.addsourceunit("File(s)")
@@ -183,8 +179,7 @@ def test_plurals():
         assert checkunit.target == ["Leêr", "Leêrs"]
         assert checkunit.hasplural()
 
-    @staticmethod
-    def test_nplural():
+    def test_nplural(self):
         tsstr = """<!DOCTYPE TS>
 <TS version="2.0" language="xx" sourcelanguage="de">
 </TS>
@@ -194,8 +189,7 @@ def test_nplural():
         tsfile = ts.tsfile.parsestring(TS_CONTEXT_QT4)
         assert tsfile.nplural() == 3
 
-    @staticmethod
-    def test_language():
+    def test_language(self):
         """Check that we can get and set language and sourcelanguage in the header."""
         tsstr = """<!DOCTYPE TS>
 <TS version="2.0" language="fr" sourcelanguage="de">
@@ -215,8 +209,7 @@ def test_language():
         tsfile = ts.tsfile.parsestring(tsstr)
         assert tsfile.getsourcelanguage() == "en"
 
-    @staticmethod
-    def test_edit():
+    def test_edit(self):
         """Test editing works well."""
         tsstr = """<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
@@ -240,8 +233,7 @@ def test_edit():
         newtsstr = tsstr.replace(">TargetString", ' type="unfinished">TestTarget')
         assert newtsstr == bytes(tsfile).decode("utf-8")
 
-    @staticmethod
-    def test_obsolete():
+    def test_obsolete(self):
         tsfile = ts.tsfile.parsestring(TS_CONTEXT_QT4)
         assert tsfile.units[0].istranslatable()
         assert not tsfile.units[0].isobsolete()
@@ -255,8 +247,7 @@ def test_obsolete():
         assert not tsfile.units[2].istranslatable()
         assert tsfile.units[2].isobsolete()
 
-    @staticmethod
-    def test_locations():
+    def test_locations(self):
         """Test that locations work well."""
         tsstr = """<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
@@ -296,8 +287,7 @@ def test_locations():
         assert tsfile.units[2].getlocations() == []
         assert tsfile.units[3].getlocations() == []
 
-    @staticmethod
-    def test_merge_with_fuzzies():
+    def test_merge_with_fuzzies(self):
         """Test that merge with fuzzy works well."""
         tsstr1 = """<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
@@ -346,22 +336,19 @@ def test_merge_with_fuzzies():
         assert tsfile2.units[0].isfuzzy()
         assert not tsfile2.units[1].isfuzzy()
 
-    @staticmethod
-    def test_getid():
+    def test_getid(self):
         """Test that getid works well."""
         tsfile = ts.tsfile.parsestring(TS_NUMERUS)
         assert tsfile.units[0].getid() == "Dialog2%n files"
         assert tsfile.units[1].getid() == "Dialog2\nthis_is_some_id%n cars"
         assert tsfile.units[3].getid() == "Dialog2\nthis_is_another_idfunc3"
 
-    @staticmethod
-    def test_backnforth():
+    def test_backnforth(self):
         """Test that ts files are read and output properly."""
         tsfile = ts.tsfile.parsestring(TS_NUMERUS)
         assert bytes(tsfile).decode("utf-8") == TS_NUMERUS
 
-    @staticmethod
-    def test_context():
+    def test_context(self):
         tsfile = ts.tsfile.parsestring(TS_NUMERUS)
         unit = tsfile.units[0]
 
@@ -386,15 +373,13 @@ def test_context():
         newunit.setcontext("Some context")
         assert newunit.getcontext() == "Some context"
 
-    @staticmethod
-    def test_roundtrip_context():
+    def test_roundtrip_context(self):
         tsfile = ts.tsfile.parsestring(TS_CONTEXT_QT4)
         assert bytes(tsfile).decode("utf-8") == TS_CONTEXT_QT4
         tsfile = ts.tsfile.parsestring(TS_CONTEXT_QT5)
         assert bytes(tsfile).decode("utf-8") == TS_CONTEXT_QT5
 
-    @staticmethod
-    def test_edit_missing_translation():
+    def test_edit_missing_translation(self):
         """Test editing with missing translation element works well."""
         tsstr = """<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
@@ -416,8 +401,7 @@ def test_edit_missing_translation():
         )
         assert newtsstr == bytes(tsfile).decode("utf-8")
 
-    @staticmethod
-    def test_missing_source():
+    def test_missing_source(self):
         tsstr = """<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="en_EN">
diff --git a/tests/translate/storage/test_wordfast.py b/tests/translate/storage/test_wordfast.py
index 5d6923788a..40ac0b7455 100644
--- a/tests/translate/storage/test_wordfast.py
+++ b/tests/translate/storage/test_wordfast.py
@@ -4,16 +4,14 @@
 
 
 class TestWFTime:
-    @staticmethod
-    def test_timestring():
+    def test_timestring(self):
         """Setting and getting times set using a timestring."""
         wftime = wf.WordfastTime()
         assert wftime.timestring is None
         wftime.timestring = "19710820~050000"
         assert wftime.time[:6] == (1971, 8, 20, 5, 0, 0)
 
-    @staticmethod
-    def test_time():
+    def test_time(self):
         """Setting and getting times set using time tuple."""
         wftime = wf.WordfastTime()
         assert wftime.time is None
diff --git a/tests/translate/storage/test_xliff.py b/tests/translate/storage/test_xliff.py
index 9011280294..104bd2802d 100644
--- a/tests/translate/storage/test_xliff.py
+++ b/tests/translate/storage/test_xliff.py
@@ -86,8 +86,7 @@ class TestXLIFFfile(test_base.TestTranslationStore):
         </file>
 </xliff>"""
 
-    @staticmethod
-    def test_basic():
+    def test_basic(self):
         xlifffile = xliff.xlifffile()
         assert xlifffile.units == []
         xlifffile.addsourceunit("Bla")
@@ -99,8 +98,7 @@ def test_basic():
         assert newfile.findunit("Bla").source == "Bla"
         assert newfile.findunit("dit") is None
 
-    @staticmethod
-    def test_namespace():
+    def test_namespace(self):
         """Check that we handle namespaces other than the default correctly."""
         xlfsource = """<?xml version="1.0" encoding="utf-8"?>
 <xliff:xliff version="1.2" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
@@ -116,8 +114,7 @@ def test_namespace():
         print(bytes(xlifffile))
         assert xlifffile.units[0].source == "File 1"
 
-    @staticmethod
-    def test_rich_source():
+    def test_rich_source(self):
         xlifffile = xliff.xlifffile()
         xliffunit = xlifffile.addsourceunit("")
 
@@ -166,8 +163,7 @@ def test_rich_source():
             StringElem(["foobaz", G(id="oof", sub=[G(id="zab", sub=["barrab"])])])
         ]
 
-    @staticmethod
-    def test_rich_target():
+    def test_rich_target(self):
         xlifffile = xliff.xlifffile()
         xliffunit = xlifffile.addsourceunit("")
 
@@ -233,8 +229,7 @@ def test_rich_target():
 """
         )
 
-    @staticmethod
-    def test_source():
+    def test_source(self):
         xlifffile = xliff.xlifffile()
         xliffunit = xlifffile.addsourceunit("Concept")
         xliffunit.source = "Term"
@@ -243,8 +238,7 @@ def test_source():
         assert newfile.findunit("Concept") is None
         assert newfile.findunit("Term") is not None
 
-    @staticmethod
-    def test_target():
+    def test_target(self):
         xlifffile = xliff.xlifffile()
         xliffunit = xlifffile.addsourceunit("Concept")
         xliffunit.target = "Konsep"
@@ -252,24 +246,21 @@ def test_target():
         print(bytes(xlifffile))
         assert newfile.findunit("Concept").target == "Konsep"
 
-    @staticmethod
-    def test_sourcelanguage():
+    def test_sourcelanguage(self):
         xlifffile = xliff.xlifffile(sourcelanguage="xh")
         xmltext = bytes(xlifffile).decode("utf-8")
         print(xmltext)
         assert xmltext.find('source-language="xh"') > 0
         # TODO: test that it also works for new files.
 
-    @staticmethod
-    def test_targetlanguage():
+    def test_targetlanguage(self):
         xlifffile = xliff.xlifffile(sourcelanguage="zu", targetlanguage="af")
         xmltext = bytes(xlifffile).decode("utf-8")
         print(xmltext)
         assert xmltext.find('source-language="zu"') > 0
         assert xmltext.find('target-language="af"') > 0
 
-    @staticmethod
-    def test_targetlanguage_multi():
+    def test_targetlanguage_multi(self):
         xlfsource = """<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE foo [ <!ELEMENT foo ANY > <!ENTITY xxe SYSTEM "file:///etc/passwd" >]>
 <xliff version="1.1" xmlns="urn:oasis:names:tc:xliff:document:1.1">
@@ -286,8 +277,7 @@ def test_targetlanguage_multi():
         assert xmltext.count('source-language="de"') == 2
         assert xmltext.count('target-language="cs"') == 2
 
-    @staticmethod
-    def test_notes():
+    def test_notes(self):
         xlifffile = xliff.xlifffile()
         unit = xlifffile.addsourceunit("Concept")
         # We don't want to add unnecessary notes
@@ -329,8 +319,7 @@ def test_notes():
         assert unit.correctorigin(notenodes[2], "ad")
         assert not unit.correctorigin(notenodes[2], "om")
 
-    @staticmethod
-    def test_alttrans():
+    def test_alttrans(self):
         """Test xliff <alt-trans> accessors."""
         xlifffile = xliff.xlifffile()
         unit = xlifffile.addsourceunit("Testing")
@@ -379,8 +368,7 @@ def test_alttrans():
             < unitformat.find("<alt-trans")
         )
 
-    @staticmethod
-    def test_fuzzy():
+    def test_fuzzy(self):
         xlifffile = xliff.xlifffile()
         unit = xlifffile.addsourceunit("Concept")
         unit.markfuzzy()
@@ -492,8 +480,7 @@ def test_parsing(self):
         xlifffile = xliff.xlifffile.parsestring(xlfsource)
         assert xlifffile.units[0].istranslatable()
 
-    @staticmethod
-    def test_entities():
+    def test_entities(self):
         xlfsource = """<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE foo [ <!ELEMENT foo ANY > <!ENTITY xxe SYSTEM "file:///etc/passwd" >]>
 <xliff version="1.1" xmlns="urn:oasis:names:tc:xliff:document:1.1">
@@ -516,8 +503,7 @@ def test_entities():
         assert xlifffile.units[1].istranslatable()
         assert xlifffile.units[1].source == "&"
 
-    @staticmethod
-    def test_multiple_filenodes():
+    def test_multiple_filenodes(self):
         xlfsource = """<?xml version="1.0" encoding="utf-8"?>
 <xliff version="1.1" xmlns="urn:oasis:names:tc:xliff:document:1.1">
   <file original="file0" source-language="en" datatype="plaintext">
@@ -557,8 +543,7 @@ def test_multiple_filenodes():
         assert newxfile.getfilenode("file1") is not None
         assert not newxfile.getfilenode("foo")
 
-    @staticmethod
-    def test_indent():
+    def test_indent(self):
         xlfsource = b"""<?xml version="1.0" encoding="UTF-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.1" version="1.1">
   <file original="doc.txt" source-language="en-US">
@@ -589,8 +574,7 @@ def test_indent():
         xfile.units[0].addnote("Test note")
         assert bytes(xfile) == xlfsourcenote
 
-    @staticmethod
-    def test_add_target():
+    def test_add_target(self):
         xlfsource = """<?xml version="1.0" encoding="UTF-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.1" version="1.1">
   <file original="doc.txt" source-language="en-US">
@@ -617,8 +601,7 @@ def test_add_target():
         xfile.units[0].rich_target = ["Soubor"]
         assert bytes(xfile).decode("ascii") == xlftarget
 
-    @staticmethod
-    def test_preserve():
+    def test_preserve(self):
         xlfsource = """<?xml version="1.0" encoding="UTF-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.1" version="1.1">
   <file original="doc.txt" source-language="en-US">
@@ -637,8 +620,7 @@ def test_preserve():
         newfile = xliff.xlifffile.parsestring(bytes(xfile))
         assert newfile.units[0].target == "H  E"
 
-    @staticmethod
-    def test_closing_tags():
+    def test_closing_tags(self):
         xlfsource = """<?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en-US" target-language="en-US" original="Email - SMTP API">
@@ -661,8 +643,7 @@ def test_closing_tags():
 
         assert bytes(xlifffile).decode("utf-8") == xlfsource
 
-    @staticmethod
-    def test_context_groups():
+    def test_context_groups(self):
         xlfsource = """<?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en-US" target-language="en-US" original="Email - SMTP API">
@@ -692,8 +673,7 @@ def test_context_groups():
         assert contextGroups[0][1][0] == "linenumber"
         assert contextGroups[0][1][1] == "222"
 
-    @staticmethod
-    def test_getlocations():
+    def test_getlocations(self):
         xlfsource = """<?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en-US" target-language="en-US" original="Email - SMTP API">
@@ -717,8 +697,7 @@ def test_getlocations():
 
         assert locations == ["some-directory/on-some-test/test.file:222"]
 
-    @staticmethod
-    def test_addlocation():
+    def test_addlocation(self):
         xlfsource = """<?xml version="1.0" encoding="utf-8"?>
 <xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.2" xsi:schemaLocation="urn:oasis:names:tc:xliff:document:1.2 xliff-core-1.2-transitional.xsd">
   <file datatype="xml" source-language="en-US" target-language="en-US" original="Email - SMTP API">
diff --git a/tests/translate/storage/test_yaml.py b/tests/translate/storage/test_yaml.py
index d90859e9de..1ecc906f27 100644
--- a/tests/translate/storage/test_yaml.py
+++ b/tests/translate/storage/test_yaml.py
@@ -520,8 +520,7 @@ def test_ruby(self):
         store.parse(data)
         assert bytes(store) == data.encode("ascii")
 
-    @staticmethod
-    def test_invalid_value():
+    def test_invalid_value(self):
         store = yaml.YAMLFile()
         with pytest.raises(base.ParseError):
             store.parse('val: "\\u string"')
diff --git a/tests/translate/tools/test_phppo2pypo.py b/tests/translate/tools/test_phppo2pypo.py
index 504175d5f0..05021cd071 100644
--- a/tests/translate/tools/test_phppo2pypo.py
+++ b/tests/translate/tools/test_phppo2pypo.py
@@ -10,8 +10,7 @@
 
 
 class TestPhpPo2PyPo:
-    @staticmethod
-    def test_single_po():
+    def test_single_po(self):
         inputfile = b"""
 # This user comment refers to: %1$s
 #. This developer comment does too: %1$s
@@ -30,8 +29,7 @@ def test_single_po():
         assert 'msgid "I have {1} apples and {0} oranges"' in output
         assert 'msgstr "I have {1} apples and {0} oranges"' in output
 
-    @staticmethod
-    def test_plural_po():
+    def test_plural_po(self):
         inputfile = b"""
 #. This developer comment refers to %1$s
 #: some/path.php:111
diff --git a/tests/translate/tools/test_podebug.py b/tests/translate/tools/test_podebug.py
index 2f049761bb..dfe15f1f9b 100644
--- a/tests/translate/tools/test_podebug.py
+++ b/tests/translate/tools/test_podebug.py
@@ -33,8 +33,7 @@ def test_ignore_gtk(self):
         unit = base.TranslationUnit("default:LTR")
         assert self.debug.ignore_gtk(unit)
 
-    @staticmethod
-    def test_keep_target():
+    def test_keep_target(self):
         """Test that we use the target for rewriting if it exists."""
         unit = base.TranslationUnit("blie")
 
@@ -70,26 +69,22 @@ def test_rewrite_unicode(self):
         """Test the unicode rewrite function."""
         assert str(self.debug.rewrite_unicode("Test")) == "Ŧḗşŧ"
 
-    @staticmethod
-    def test_rewrite_unicode_preserves_at_placeholders():
+    def test_rewrite_unicode_preserves_at_placeholders(self):
         """Test the unicode rewrite function."""
         debug = podebug.podebug(preserveplaceholders=True)
         assert str(debug.rewrite_unicode("@@ph@@Test @@ph@@")) == "@@ph@@Ŧḗşŧ @@ph@@"
 
-    @staticmethod
-    def test_rewrite_unicode_preserves_single_brace_placeholders():
+    def test_rewrite_unicode_preserves_single_brace_placeholders(self):
         """Test the unicode rewrite function."""
         debug = podebug.podebug(preserveplaceholders=True)
         assert str(debug.rewrite_unicode("{ph}Test {ph}")) == "{ph}Ŧḗşŧ {ph}"
 
-    @staticmethod
-    def test_rewrite_unicode_preserves_double_brace_placeholders():
+    def test_rewrite_unicode_preserves_double_brace_placeholders(self):
         """Test the unicode rewrite function."""
         debug = podebug.podebug(preserveplaceholders=True)
         assert str(debug.rewrite_unicode("{{ph}}Test {{ph}}")) == "{{ph}}Ŧḗşŧ {{ph}}"
 
-    @staticmethod
-    def test_rewrite_unicode_preserves_html():
+    def test_rewrite_unicode_preserves_html(self):
         """Test the unicode rewrite function."""
         debug = podebug.podebug(preserveplaceholders=True)
         assert (
@@ -97,8 +92,7 @@ def test_rewrite_unicode_preserves_html():
             == "<style0>Ŧḗşŧ</style0>"
         )
 
-    @staticmethod
-    def test_rewrite_unicode_preserves_multiple_styles_of_placeholder():
+    def test_rewrite_unicode_preserves_multiple_styles_of_placeholder(self):
         """Test the unicode rewrite function."""
         debug = podebug.podebug(preserveplaceholders=True)
         assert (
@@ -115,30 +109,26 @@ def test_rewrite_flipped(self):
         assert str(self.debug.rewrite_flipped(" ")) == "\u202e "
         assert str(self.debug.rewrite_flipped("©")) == "\u202e©"
 
-    @staticmethod
-    def test_rewrite_flipped_preserves_at_placeholders():
+    def test_rewrite_flipped_preserves_at_placeholders(self):
         """Test the unicode rewrite function."""
         debug = podebug.podebug(preserveplaceholders=True)
         assert (
             str(debug.rewrite_flipped("@@ph@@Test @@ph@@")) == "\u202e@@ph@@⊥ǝsʇ @@ph@@"
         )
 
-    @staticmethod
-    def test_rewrite_flipped_preserves_single_brace_placeholders():
+    def test_rewrite_flipped_preserves_single_brace_placeholders(self):
         """Test the unicode rewrite function."""
         debug = podebug.podebug(preserveplaceholders=True)
         assert str(debug.rewrite_flipped("{ph}Test {ph}")) == "\u202e{ph}⊥ǝsʇ {ph}"
 
-    @staticmethod
-    def test_rewrite_flipped_preserves_double_brace_placeholders():
+    def test_rewrite_flipped_preserves_double_brace_placeholders(self):
         """Test the unicode rewrite function."""
         debug = podebug.podebug(preserveplaceholders=True)
         assert (
             str(debug.rewrite_flipped("{{ph}}Test {{ph}}")) == "\u202e{{ph}}⊥ǝsʇ {{ph}}"
         )
 
-    @staticmethod
-    def test_rewrite_flipped_preserves_html():
+    def test_rewrite_flipped_preserves_html(self):
         """Test the unicode rewrite function."""
         debug = podebug.podebug(preserveplaceholders=True)
         assert (
@@ -146,8 +136,7 @@ def test_rewrite_flipped_preserves_html():
             == "\u202e<style0>⊥ǝsʇ </style0>"
         )
 
-    @staticmethod
-    def test_rewrite_flipped_multiple_styles_of_placeholder():
+    def test_rewrite_flipped_multiple_styles_of_placeholder(self):
         """Test the unicode rewrite function."""
         debug = podebug.podebug(preserveplaceholders=True)
         assert (
@@ -164,26 +153,22 @@ def test_rewrite_classified(self):
         assert str(self.debug.rewrite_classified(" ")) == " "
         assert str(self.debug.rewrite_classified("©")) == "©"
 
-    @staticmethod
-    def test_rewrite_classified_preserves_at_placeholders():
+    def test_rewrite_classified_preserves_at_placeholders(self):
         """Test the unicode rewrite function."""
         debug = podebug.podebug(preserveplaceholders=True)
         assert str(debug.rewrite_classified("@@ph@@Test @@ph@@")) == "@@ph@@▮▮▮▮ @@ph@@"
 
-    @staticmethod
-    def test_rewrite_classified_preserves_single_brace_placeholders():
+    def test_rewrite_classified_preserves_single_brace_placeholders(self):
         """Test the unicode rewrite function."""
         debug = podebug.podebug(preserveplaceholders=True)
         assert str(debug.rewrite_classified("{ph}Test {ph}")) == "{ph}▮▮▮▮ {ph}"
 
-    @staticmethod
-    def test_rewrite_classified_preserves_double_brace_placeholders():
+    def test_rewrite_classified_preserves_double_brace_placeholders(self):
         """Test the unicode rewrite function."""
         debug = podebug.podebug(preserveplaceholders=True)
         assert str(debug.rewrite_classified("{{ph}}Test {{ph}}")) == "{{ph}}▮▮▮▮ {{ph}}"
 
-    @staticmethod
-    def test_rewrite_classified_preserves_html():
+    def test_rewrite_classified_preserves_html(self):
         """Test the unicode rewrite function."""
         debug = podebug.podebug(preserveplaceholders=True)
         assert (
@@ -191,8 +176,7 @@ def test_rewrite_classified_preserves_html():
             == "<style0>▮▮▮▮ </style0>"
         )
 
-    @staticmethod
-    def test_rewrite_classified_multiple_styles_of_placeholder():
+    def test_rewrite_classified_multiple_styles_of_placeholder(self):
         """Test the unicode rewrite function."""
         debug = podebug.podebug(preserveplaceholders=True)
         assert (
@@ -240,8 +224,7 @@ def test_xliff_rewrite(self):
         print(bytes(xliff_out))
         assert out_unit.target == "xxx%sxxx" % (in_unit.source)
 
-    @staticmethod
-    def test_hash():
+    def test_hash(self):
         po_docs = (
             """
 msgid "Test msgid 1"
diff --git a/tests/translate/tools/test_pomerge.py b/tests/translate/tools/test_pomerge.py
index ae0195fb3f..bbb98be373 100644
--- a/tests/translate/tools/test_pomerge.py
+++ b/tests/translate/tools/test_pomerge.py
@@ -89,8 +89,7 @@ def singleunit(self, pofile):
         assert self.countunits(pofile) == 1
         return pofile.units[-1]
 
-    @staticmethod
-    def test_mergesore_bad_data():
+    def test_mergesore_bad_data(self):
         """Test that we catch bad options sent to mergestore."""
         templatefile = BytesIO(b"")
         inputfile = BytesIO(b"")
diff --git a/tests/translate/tools/test_poterminology.py b/tests/translate/tools/test_poterminology.py
index ac8dfdf1a8..133e0f6892 100644
--- a/tests/translate/tools/test_poterminology.py
+++ b/tests/translate/tools/test_poterminology.py
@@ -8,8 +8,7 @@
 
 
 class TestPOTerminology:
-    @staticmethod
-    def test_term_extraction():
+    def test_term_extraction(self):
         """Test basic term extraction/filtering from a po file."""
         extractor = poterminology.TerminologyExtractor()
         # When no content has been provided, returns a simple dict
diff --git a/tests/translate/tools/test_pypo2phppo.py b/tests/translate/tools/test_pypo2phppo.py
index 4f4abc7174..4038148c15 100644
--- a/tests/translate/tools/test_pypo2phppo.py
+++ b/tests/translate/tools/test_pypo2phppo.py
@@ -10,8 +10,7 @@
 
 
 class TestPyPo2PhpPo:
-    @staticmethod
-    def test_single_po():
+    def test_single_po(self):
         inputfile = b"""
 # This user comment refers to: {0}
 #. This developer comment does too: {0}
@@ -30,8 +29,7 @@ def test_single_po():
         assert 'msgid "I have %2$s apples and %1$s oranges"' in output
         assert 'msgstr "I have %2$s apples and %1$s oranges"' in output
 
-    @staticmethod
-    def test_plural_po():
+    def test_plural_po(self):
         inputfile = b"""
 #. This developer comment refers to {0}
 #: some/path.php:111