diff --git a/.flake8 b/.flake8
index f1be1314a..36b38b391 100644
--- a/.flake8
+++ b/.flake8
@@ -1,6 +1,6 @@
 [flake8]
 max-line-length = 88
-ignore = E501, E203, W503, ANN101, ANN102
+ignore = E501, E203, W503, ANN101, ANN102, SIM106
 ban-relative-imports = True
 mypy-init-return = True
 format-greedy = 1
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0e0b4d3a3..ffe2786b0 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -13,6 +13,7 @@ repos:
           - flake8-annotations
           - flake8-bugbear
           - flake8-comprehensions
+          - flake8-simplify
           - flake8-tidy-imports
           - flake8-use-fstring
 
diff --git a/src/poetry/core/masonry/builders/builder.py b/src/poetry/core/masonry/builders/builder.py
index fe9b15ba6..8bc2789a5 100644
--- a/src/poetry/core/masonry/builders/builder.py
+++ b/src/poetry/core/masonry/builders/builder.py
@@ -377,13 +377,7 @@ def __init__(
         else:
             self.path = self.path
 
-        try:
-            self.path = self.path.resolve()
-        except FileNotFoundError:
-            # this is an issue in in python 3.5, since resolve uses strict=True by
-            # default, this workaround needs to be maintained till python 2.7 and
-            # python 3.5 are dropped, until we can use resolve(strict=False).
-            pass
+        self.path = self.path.resolve()
 
     def __eq__(self, other: Union["BuildIncludeFile", Path]) -> bool:
         if hasattr(other, "path"):
diff --git a/src/poetry/core/masonry/builders/wheel.py b/src/poetry/core/masonry/builders/wheel.py
index 59d5c61f9..c7e746e5a 100644
--- a/src/poetry/core/masonry/builders/wheel.py
+++ b/src/poetry/core/masonry/builders/wheel.py
@@ -101,24 +101,23 @@ def build(self) -> None:
         new_mode = normalize_file_permissions(st_mode)
         os.chmod(temp_path, new_mode)
 
-        with os.fdopen(fd, "w+b") as fd_file:
-            with zipfile.ZipFile(
-                fd_file, mode="w", compression=zipfile.ZIP_DEFLATED
-            ) as zip_file:
-                if not self._editable:
-                    if not self._poetry.package.build_should_generate_setup():
-                        self._build(zip_file)
-                        self._copy_module(zip_file)
-                    else:
-                        self._copy_module(zip_file)
-                        self._build(zip_file)
+        with os.fdopen(fd, "w+b") as fd_file, zipfile.ZipFile(
+            fd_file, mode="w", compression=zipfile.ZIP_DEFLATED
+        ) as zip_file:
+            if not self._editable:
+                if not self._poetry.package.build_should_generate_setup():
+                    self._build(zip_file)
+                    self._copy_module(zip_file)
                 else:
+                    self._copy_module(zip_file)
                     self._build(zip_file)
-                    self._add_pth(zip_file)
+            else:
+                self._build(zip_file)
+                self._add_pth(zip_file)
 
-                self._copy_file_scripts(zip_file)
-                self._write_metadata(zip_file)
-                self._write_record(zip_file)
+            self._copy_file_scripts(zip_file)
+            self._write_metadata(zip_file)
+            self._write_record(zip_file)
 
         wheel_path = dist_dir / self.wheel_filename
         if wheel_path.exists():
diff --git a/src/poetry/core/packages/constraints/multi_constraint.py b/src/poetry/core/packages/constraints/multi_constraint.py
index 2f14cfc9a..c70f97c33 100644
--- a/src/poetry/core/packages/constraints/multi_constraint.py
+++ b/src/poetry/core/packages/constraints/multi_constraint.py
@@ -24,11 +24,7 @@ def constraints(self) -> Tuple[Constraint]:
         return self._constraints
 
     def allows(self, other: "ConstraintTypes") -> bool:
-        for constraint in self._constraints:
-            if not constraint.allows(other):
-                return False
-
-        return True
+        return all(constraint.allows(other) for constraint in self._constraints)
 
     def allows_all(self, other: "ConstraintTypes") -> bool:
         if other.is_any():
@@ -64,10 +60,9 @@ def allows_any(self, other: "ConstraintTypes") -> bool:
             return self.allows(other)
 
         if isinstance(other, MultiConstraint):
-            for c1 in self.constraints:
-                for c2 in other.constraints:
-                    if c1.allows(c2):
-                        return True
+            return any(
+                c1.allows(c2) for c1 in self.constraints for c2 in other.constraints
+            )
 
         return False
 
diff --git a/src/poetry/core/packages/constraints/union_constraint.py b/src/poetry/core/packages/constraints/union_constraint.py
index c9c627835..5d1f2ee31 100644
--- a/src/poetry/core/packages/constraints/union_constraint.py
+++ b/src/poetry/core/packages/constraints/union_constraint.py
@@ -23,11 +23,7 @@ def constraints(self) -> Tuple[Constraint]:
     def allows(
         self, other: Union[Constraint, MultiConstraint, "UnionConstraint"]
     ) -> bool:
-        for constraint in self._constraints:
-            if constraint.allows(other):
-                return True
-
-        return False
+        return any(constraint.allows(other) for constraint in self._constraints)
 
     def allows_any(self, other: "ConstraintTypes") -> bool:
         if other.is_empty():
@@ -41,12 +37,11 @@ def allows_any(self, other: "ConstraintTypes") -> bool:
         else:
             constraints = other.constraints
 
-        for our_constraint in self._constraints:
-            for their_constraint in constraints:
-                if our_constraint.allows_any(their_constraint):
-                    return True
-
-        return False
+        return any(
+            our_constraint.allows_any(their_constraint)
+            for our_constraint in self._constraints
+            for their_constraint in constraints
+        )
 
     def allows_all(self, other: "ConstraintTypes") -> bool:
         if other.is_any():
diff --git a/src/poetry/core/packages/dependency.py b/src/poetry/core/packages/dependency.py
index 229ddc313..1ee0dc0f3 100644
--- a/src/poetry/core/packages/dependency.py
+++ b/src/poetry/core/packages/dependency.py
@@ -1,6 +1,7 @@
 import os
 import re
 
+from contextlib import suppress
 from pathlib import Path
 from typing import TYPE_CHECKING
 from typing import Any
@@ -573,7 +574,7 @@ def create_from_pep_508(
                     name=name, path=path, base=relative_to, extras=req.extras
                 )
             else:
-                try:
+                with suppress(ValueError):
                     # this is a local path not using the file URI scheme
                     dep = _make_file_or_dir_dep(
                         name=name,
@@ -581,8 +582,6 @@ def create_from_pep_508(
                         base=relative_to,
                         extras=req.extras,
                     )
-                except ValueError:
-                    pass
 
             if dep is None:
                 dep = Dependency(name, version or "*", extras=req.extras)
@@ -613,7 +612,7 @@ def __eq__(self, other: Any) -> bool:
         )
 
     def __ne__(self, other: Any) -> bool:
-        return not self == other
+        return not self.__eq__(other)
 
     def __hash__(self) -> int:
         return super().__hash__() ^ hash(self._constraint) ^ hash(self._extras)
diff --git a/src/poetry/core/packages/package.py b/src/poetry/core/packages/package.py
index 255bc7e56..c88376b4e 100644
--- a/src/poetry/core/packages/package.py
+++ b/src/poetry/core/packages/package.py
@@ -148,10 +148,9 @@ def full_pretty_version(self) -> str:
         if self.source_type not in ["hg", "git"]:
             return self._pretty_version
 
-        if self.source_resolved_reference:
-            if len(self.source_resolved_reference) == 40:
-                ref = self.source_resolved_reference[0:7]
-                return f"{self._pretty_version} {ref}"
+        if self.source_resolved_reference and len(self.source_resolved_reference) == 40:
+            ref = self.source_resolved_reference[0:7]
+            return f"{self._pretty_version} {ref}"
 
         # if source reference is a sha1 hash -- truncate
         if len(self.source_reference) == 40:
@@ -271,9 +270,7 @@ def license(self, value: Optional[Union[str, "License"]]) -> None:
         from poetry.core.spdx.helpers import license_by_id
         from poetry.core.spdx.license import License  # noqa
 
-        if value is None:
-            self._license = value
-        elif isinstance(value, License):
+        if value is None or isinstance(value, License):
             self._license = value
         else:
             self._license = license_by_id(value)
diff --git a/src/poetry/core/packages/specification.py b/src/poetry/core/packages/specification.py
index d423b7251..5e2b723e9 100644
--- a/src/poetry/core/packages/specification.py
+++ b/src/poetry/core/packages/specification.py
@@ -79,9 +79,10 @@ def is_same_package_as(self, other: "PackageSpecification") -> bool:
             if self._source_type != other.source_type:
                 return False
 
-            if self._source_url or other.source_url:
-                if self._source_url != other.source_url:
-                    return False
+            if (
+                self._source_url or other.source_url
+            ) and self._source_url != other.source_url:
+                return False
 
             # We check the resolved reference first:
             # if they match we assume equality regardless
diff --git a/src/poetry/core/pyproject/tables.py b/src/poetry/core/pyproject/tables.py
index 693521ac6..37427b295 100644
--- a/src/poetry/core/pyproject/tables.py
+++ b/src/poetry/core/pyproject/tables.py
@@ -1,3 +1,4 @@
+from contextlib import suppress
 from pathlib import Path
 from typing import TYPE_CHECKING
 from typing import List
@@ -39,7 +40,9 @@ def dependencies(self) -> List["Dependency"]:
                 except ValueError:
                     # PEP 517 requires can be path if not PEP 508
                     path = Path(requirement)
-                    try:
+                    # compatibility Python < 3.8
+                    # https://docs.python.org/3/library/pathlib.html#methods
+                    with suppress(OSError):
                         if path.is_file():
                             dependency = FileDependency(
                                 name=canonicalize_name(path.name), path=path
@@ -48,10 +51,6 @@ def dependencies(self) -> List["Dependency"]:
                             dependency = DirectoryDependency(
                                 name=canonicalize_name(path.name), path=path
                             )
-                    except OSError:
-                        # compatibility Python < 3.8
-                        # https://docs.python.org/3/library/pathlib.html#methods
-                        pass
 
                 if dependency is None:
                     # skip since we could not determine requirement
diff --git a/src/poetry/core/semver/helpers.py b/src/poetry/core/semver/helpers.py
index 85732b1f5..4e34ff6fd 100644
--- a/src/poetry/core/semver/helpers.py
+++ b/src/poetry/core/semver/helpers.py
@@ -147,16 +147,15 @@ def parse_single_constraint(constraint: str) -> VersionTypes:
 
         if op == "<":
             return VersionRange(max=version)
-        elif op == "<=":
+        if op == "<=":
             return VersionRange(max=version, include_max=True)
-        elif op == ">":
+        if op == ">":
             return VersionRange(min=version)
-        elif op == ">=":
+        if op == ">=":
             return VersionRange(min=version, include_min=True)
-        elif op == "!=":
+        if op == "!=":
             return VersionUnion(VersionRange(max=version), VersionRange(min=version))
-        else:
-            return version
+        return version
 
     from poetry.core.semver.exceptions import ParseConstraintError
 
diff --git a/src/poetry/core/version/markers.py b/src/poetry/core/version/markers.py
index 00caa879f..3f0388d27 100644
--- a/src/poetry/core/version/markers.py
+++ b/src/poetry/core/version/markers.py
@@ -461,11 +461,7 @@ def union(self, other: MarkerTypes) -> MarkerTypes:
         return other.union(self)
 
     def validate(self, environment: Dict[str, Any]) -> bool:
-        for m in self._markers:
-            if not m.validate(environment):
-                return False
-
-        return True
+        return all(m.validate(environment) for m in self._markers)
 
     def without_extras(self) -> MarkerTypes:
         return self.exclude("extra")
@@ -521,9 +517,7 @@ def __hash__(self) -> int:
     def __str__(self) -> str:
         elements = []
         for m in self._markers:
-            if isinstance(m, SingleMarker):
-                elements.append(str(m))
-            elif isinstance(m, MultiMarker):
+            if isinstance(m, (SingleMarker, MultiMarker)):
                 elements.append(str(m))
             else:
                 elements.append(f"({str(m)})")
@@ -625,11 +619,7 @@ def union(self, other: MarkerTypes) -> MarkerTypes:
         return MarkerUnion.of(*new_markers)
 
     def validate(self, environment: Dict[str, Any]) -> bool:
-        for m in self._markers:
-            if m.validate(environment):
-                return True
-
-        return False
+        return any(m.validate(environment) for m in self._markers)
 
     def without_extras(self) -> MarkerTypes:
         return self.exclude("extra")
@@ -733,9 +723,8 @@ def _compact_markers(tree_elements: "Tree", tree_prefix: str = "") -> MarkerType
 
             value = value[1:-1]
             groups[-1] = MultiMarker.of(groups[-1], SingleMarker(name, f"{op}{value}"))
-        elif token.data == f"{tree_prefix}BOOL_OP":
-            if token.children[0] == "or":
-                groups.append(MultiMarker())
+        elif token.data == f"{tree_prefix}BOOL_OP" and token.children[0] == "or":
+            groups.append(MultiMarker())
 
     for i, group in enumerate(reversed(groups)):
         if group.is_empty():
diff --git a/tests/masonry/builders/test_builder.py b/tests/masonry/builders/test_builder.py
index 1e45c9cd4..59d44b53a 100644
--- a/tests/masonry/builders/test_builder.py
+++ b/tests/masonry/builders/test_builder.py
@@ -143,7 +143,7 @@ def test_metadata_with_vcs_dependencies():
 
     requires_dist = metadata["Requires-Dist"]
 
-    assert "cleo @ git+https://github.com/sdispater/cleo.git@master" == requires_dist
+    assert requires_dist == "cleo @ git+https://github.com/sdispater/cleo.git@master"
 
 
 def test_metadata_with_url_dependencies():
@@ -158,8 +158,8 @@ def test_metadata_with_url_dependencies():
     requires_dist = metadata["Requires-Dist"]
 
     assert (
-        "demo @ https://python-poetry.org/distributions/demo-0.1.0-py2.py3-none-any.whl"
-        == requires_dist
+        requires_dist
+        == "demo @ https://python-poetry.org/distributions/demo-0.1.0-py2.py3-none-any.whl"
     )
 
 
diff --git a/tests/masonry/builders/test_sdist.py b/tests/masonry/builders/test_sdist.py
index 30216fc18..31c160975 100644
--- a/tests/masonry/builders/test_sdist.py
+++ b/tests/masonry/builders/test_sdist.py
@@ -468,9 +468,9 @@ def test_default_with_excluded_data(mocker: "MockerFixture"):
                 "my-package-1.2.3/PKG-INFO",
             ]:
                 # generated files have timestamp set to 0
-                assert 0 == tarinfo.mtime
+                assert tarinfo.mtime == 0
                 continue
-            assert 0 < tarinfo.mtime
+            assert tarinfo.mtime > 0
 
 
 def test_src_excluded_nested_data():
diff --git a/tests/masonry/test_api.py b/tests/masonry/test_api.py
index 1bfaed659..b8871cc2c 100644
--- a/tests/masonry/test_api.py
+++ b/tests/masonry/test_api.py
@@ -182,7 +182,7 @@ def test_prepare_metadata_for_build_wheel():
     with temporary_directory() as tmp_dir, cwd(os.path.join(fixtures, "complete")):
         dirname = api.prepare_metadata_for_build_wheel(tmp_dir)
 
-        assert "my_package-1.2.3.dist-info" == dirname
+        assert dirname == "my_package-1.2.3.dist-info"
 
         dist_info = Path(tmp_dir, dirname)
 
diff --git a/tests/packages/test_dependency.py b/tests/packages/test_dependency.py
index 34429a68f..9350d61ce 100644
--- a/tests/packages/test_dependency.py
+++ b/tests/packages/test_dependency.py
@@ -152,7 +152,7 @@ def test_to_pep_508_in_extras_parsed():
 def test_to_pep_508_with_single_version_excluded():
     dependency = Dependency("foo", "!=1.2.3")
 
-    assert "foo (!=1.2.3)" == dependency.to_pep_508()
+    assert dependency.to_pep_508() == "foo (!=1.2.3)"
 
 
 @pytest.mark.parametrize(
@@ -178,54 +178,54 @@ def test_to_pep_508_with_patch_python_version(python_versions: str, marker: str)
 def test_to_pep_508_tilde():
     dependency = Dependency("foo", "~1.2.3")
 
-    assert "foo (>=1.2.3,<1.3.0)" == dependency.to_pep_508()
+    assert dependency.to_pep_508() == "foo (>=1.2.3,<1.3.0)"
 
     dependency = Dependency("foo", "~1.2")
 
-    assert "foo (>=1.2,<1.3)" == dependency.to_pep_508()
+    assert dependency.to_pep_508() == "foo (>=1.2,<1.3)"
 
     dependency = Dependency("foo", "~0.2.3")
 
-    assert "foo (>=0.2.3,<0.3.0)" == dependency.to_pep_508()
+    assert dependency.to_pep_508() == "foo (>=0.2.3,<0.3.0)"
 
     dependency = Dependency("foo", "~0.2")
 
-    assert "foo (>=0.2,<0.3)" == dependency.to_pep_508()
+    assert dependency.to_pep_508() == "foo (>=0.2,<0.3)"
 
 
 def test_to_pep_508_caret():
     dependency = Dependency("foo", "^1.2.3")
 
-    assert "foo (>=1.2.3,<2.0.0)" == dependency.to_pep_508()
+    assert dependency.to_pep_508() == "foo (>=1.2.3,<2.0.0)"
 
     dependency = Dependency("foo", "^1.2")
 
-    assert "foo (>=1.2,<2.0)" == dependency.to_pep_508()
+    assert dependency.to_pep_508() == "foo (>=1.2,<2.0)"
 
     dependency = Dependency("foo", "^0.2.3")
 
-    assert "foo (>=0.2.3,<0.3.0)" == dependency.to_pep_508()
+    assert dependency.to_pep_508() == "foo (>=0.2.3,<0.3.0)"
 
     dependency = Dependency("foo", "^0.2")
 
-    assert "foo (>=0.2,<0.3)" == dependency.to_pep_508()
+    assert dependency.to_pep_508() == "foo (>=0.2,<0.3)"
 
 
 def test_to_pep_508_combination():
     dependency = Dependency("foo", "^1.2,!=1.3.5")
 
-    assert "foo (>=1.2,<2.0,!=1.3.5)" == dependency.to_pep_508()
+    assert dependency.to_pep_508() == "foo (>=1.2,<2.0,!=1.3.5)"
 
     dependency = Dependency("foo", "~1.2,!=1.2.5")
 
-    assert "foo (>=1.2,<1.3,!=1.2.5)" == dependency.to_pep_508()
+    assert dependency.to_pep_508() == "foo (>=1.2,<1.3,!=1.2.5)"
 
 
 def test_complete_name():
-    assert "foo" == Dependency("foo", ">=1.2.3").complete_name
+    assert Dependency("foo", ">=1.2.3").complete_name == "foo"
     assert (
-        "foo[bar,baz]"
-        == Dependency("foo", ">=1.2.3", extras=["baz", "bar"]).complete_name
+        Dependency("foo", ">=1.2.3", extras=["baz", "bar"]).complete_name
+        == "foo[bar,baz]"
     )
 
 
diff --git a/tests/packages/test_main.py b/tests/packages/test_main.py
index c25158c54..c7407b7cb 100644
--- a/tests/packages/test_main.py
+++ b/tests/packages/test_main.py
@@ -177,11 +177,11 @@ def test_dependency_from_pep_508_with_git_url():
 
     dep = Dependency.create_from_pep_508(name)
 
-    assert "django-utils" == dep.name
+    assert dep.name == "django-utils"
     assert dep.is_vcs()
-    assert "git" == dep.vcs
-    assert "ssh://git@corp-gitlab.com/corp-utils.git" == dep.source
-    assert "1.2" == dep.reference
+    assert dep.vcs == "git"
+    assert dep.source == "ssh://git@corp-gitlab.com/corp-utils.git"
+    assert dep.reference == "1.2"
 
 
 def test_dependency_from_pep_508_with_git_url_and_subdirectory():
@@ -189,12 +189,12 @@ def test_dependency_from_pep_508_with_git_url_and_subdirectory():
 
     dep = Dependency.create_from_pep_508(name)
 
-    assert "django-utils" == dep.name
+    assert dep.name == "django-utils"
     assert dep.is_vcs()
-    assert "git" == dep.vcs
-    assert "ssh://git@corp-gitlab.com/corp-utils.git" == dep.source
-    assert "1.2" == dep.reference
-    assert "package-dir" == dep.directory
+    assert dep.vcs == "git"
+    assert dep.source == "ssh://git@corp-gitlab.com/corp-utils.git"
+    assert dep.reference == "1.2"
+    assert dep.directory == "package-dir"
 
 
 def test_dependency_from_pep_508_with_git_url_and_comment_and_extra():
@@ -205,11 +205,11 @@ def test_dependency_from_pep_508_with_git_url_and_comment_and_extra():
 
     dep = Dependency.create_from_pep_508(name)
 
-    assert "poetry" == dep.name
+    assert dep.name == "poetry"
     assert dep.is_vcs()
-    assert "git" == dep.vcs
-    assert "https://github.com/python-poetry/poetry.git" == dep.source
-    assert "b;ar;" == dep.reference
+    assert dep.vcs == "git"
+    assert dep.source == "https://github.com/python-poetry/poetry.git"
+    assert dep.reference == "b;ar;"
     assert dep.in_extras == ["foo;"]
 
 
@@ -218,9 +218,9 @@ def test_dependency_from_pep_508_with_url():
 
     dep = Dependency.create_from_pep_508(name)
 
-    assert "django-utils" == dep.name
+    assert dep.name == "django-utils"
     assert dep.is_url()
-    assert "https://example.com/django-utils-1.0.0.tar.gz" == dep.url
+    assert dep.url == "https://example.com/django-utils-1.0.0.tar.gz"
 
 
 def test_dependency_from_pep_508_with_wheel_url():
@@ -230,7 +230,7 @@ def test_dependency_from_pep_508_with_wheel_url():
 
     dep = Dependency.create_from_pep_508(name)
 
-    assert "example-wheel" == dep.name
+    assert dep.name == "example-wheel"
     assert str(dep.constraint) == "14.0.2"
 
 
diff --git a/tests/packages/test_package.py b/tests/packages/test_package.py
index 394d9e656..3dfdc2cdc 100644
--- a/tests/packages/test_package.py
+++ b/tests/packages/test_package.py
@@ -206,9 +206,9 @@ def test_package_resolved_reference_is_relevant_for_equality_only_if_present_for
 
 
 def test_complete_name():
-    assert "foo" == Package("foo", "1.2.3").complete_name
+    assert Package("foo", "1.2.3").complete_name == "foo"
     assert (
-        "foo[bar,baz]" == Package("foo", "1.2.3", features=["baz", "bar"]).complete_name
+        Package("foo", "1.2.3", features=["baz", "bar"]).complete_name == "foo[bar,baz]"
     )
 
 
@@ -216,8 +216,8 @@ def test_to_dependency():
     package = Package("foo", "1.2.3")
     dep = package.to_dependency()
 
-    assert "foo" == dep.name
-    assert package.version == dep.constraint
+    assert dep.name == "foo"
+    assert dep.constraint == package.version
 
 
 def test_to_dependency_with_python_constraint():
@@ -225,18 +225,18 @@ def test_to_dependency_with_python_constraint():
     package.python_versions = ">=3.6"
     dep = package.to_dependency()
 
-    assert "foo" == dep.name
-    assert package.version == dep.constraint
-    assert ">=3.6" == dep.python_versions
+    assert dep.name == "foo"
+    assert dep.constraint == package.version
+    assert dep.python_versions == ">=3.6"
 
 
 def test_to_dependency_with_features():
     package = Package("foo", "1.2.3", features=["baz", "bar"])
     dep = package.to_dependency()
 
-    assert "foo" == dep.name
-    assert package.version == dep.constraint
-    assert frozenset({"bar", "baz"}) == dep.features
+    assert dep.name == "foo"
+    assert dep.constraint == package.version
+    assert dep.features == frozenset({"bar", "baz"})
 
 
 def test_to_dependency_for_directory():
@@ -250,13 +250,13 @@ def test_to_dependency_for_directory():
     )
     dep = package.to_dependency()
 
-    assert "foo" == dep.name
-    assert package.version == dep.constraint
-    assert frozenset({"bar", "baz"}) == dep.features
+    assert dep.name == "foo"
+    assert dep.constraint == package.version
+    assert dep.features == frozenset({"bar", "baz"})
     assert dep.is_directory()
-    assert path == dep.path
-    assert "directory" == dep.source_type
-    assert path.as_posix() == dep.source_url
+    assert dep.path == path
+    assert dep.source_type == "directory"
+    assert dep.source_url == path.as_posix()
 
 
 def test_to_dependency_for_file():
@@ -272,13 +272,13 @@ def test_to_dependency_for_file():
     )
     dep = package.to_dependency()
 
-    assert "foo" == dep.name
-    assert package.version == dep.constraint
-    assert frozenset({"bar", "baz"}) == dep.features
+    assert dep.name == "foo"
+    assert dep.constraint == package.version
+    assert dep.features == frozenset({"bar", "baz"})
     assert dep.is_file()
-    assert path == dep.path
-    assert "file" == dep.source_type
-    assert path.as_posix() == dep.source_url
+    assert dep.path == path
+    assert dep.source_type == "file"
+    assert dep.source_url == path.as_posix()
 
 
 def test_to_dependency_for_url():
@@ -291,13 +291,13 @@ def test_to_dependency_for_url():
     )
     dep = package.to_dependency()
 
-    assert "foo" == dep.name
-    assert package.version == dep.constraint
-    assert frozenset({"bar", "baz"}) == dep.features
+    assert dep.name == "foo"
+    assert dep.constraint == package.version
+    assert dep.features == frozenset({"bar", "baz"})
     assert dep.is_url()
-    assert "https://example.com/path.tar.gz" == dep.url
-    assert "url" == dep.source_type
-    assert "https://example.com/path.tar.gz" == dep.source_url
+    assert dep.url == "https://example.com/path.tar.gz"
+    assert dep.source_type == "url"
+    assert dep.source_url == "https://example.com/path.tar.gz"
 
 
 def test_to_dependency_for_vcs():
@@ -313,17 +313,17 @@ def test_to_dependency_for_vcs():
     )
     dep = package.to_dependency()
 
-    assert "foo" == dep.name
-    assert package.version == dep.constraint
-    assert frozenset({"bar", "baz"}) == dep.features
+    assert dep.name == "foo"
+    assert dep.constraint == package.version
+    assert dep.features == frozenset({"bar", "baz"})
     assert dep.is_vcs()
-    assert "git" == dep.source_type
-    assert "https://github.com/foo/foo.git" == dep.source
-    assert "master" == dep.reference
-    assert "master" == dep.source_reference
-    assert "123456" == dep.source_resolved_reference
-    assert "baz" == dep.directory
-    assert "baz" == dep.source_subdirectory
+    assert dep.source_type == "git"
+    assert dep.source == "https://github.com/foo/foo.git"
+    assert dep.reference == "master"
+    assert dep.source_reference == "master"
+    assert dep.source_resolved_reference == "123456"
+    assert dep.directory == "baz"
+    assert dep.source_subdirectory == "baz"
 
 
 def test_package_clone(f: Factory):
diff --git a/tests/spdx/test_license.py b/tests/spdx/test_license.py
index 55d0e8a16..d9e7e435f 100644
--- a/tests/spdx/test_license.py
+++ b/tests/spdx/test_license.py
@@ -47,10 +47,10 @@ def test_classifier_no_classifer():
 def test_proprietary_license():
     license = license_by_id("Proprietary")
 
-    assert "License :: Other/Proprietary License" == license.classifier
+    assert license.classifier == "License :: Other/Proprietary License"
 
 
 def test_custom_license():
     license = license_by_id("Amazon Software License")
 
-    assert "License :: Other/Proprietary License" == license.classifier
+    assert license.classifier == "License :: Other/Proprietary License"
diff --git a/tests/version/test_markers.py b/tests/version/test_markers.py
index a317205aa..4ca251c35 100644
--- a/tests/version/test_markers.py
+++ b/tests/version/test_markers.py
@@ -454,14 +454,14 @@ def test_intersect_compacts_constraints():
 def test_multi_marker_removes_duplicates():
     m = parse_marker('sys_platform == "win32" and sys_platform == "win32"')
 
-    assert 'sys_platform == "win32"' == str(m)
+    assert str(m) == 'sys_platform == "win32"'
 
     m = parse_marker(
         'sys_platform == "darwin" and implementation_name == "cpython" '
         'and sys_platform == "darwin" and implementation_name == "cpython"'
     )
 
-    assert 'sys_platform == "darwin" and implementation_name == "cpython"' == str(m)
+    assert str(m) == 'sys_platform == "darwin" and implementation_name == "cpython"'
 
 
 @pytest.mark.parametrize(