diff --git a/parsons/donorbox/donorbox.py b/parsons/donorbox/donorbox.py
index eac983505d..1adc10d8df 100644
--- a/parsons/donorbox/donorbox.py
+++ b/parsons/donorbox/donorbox.py
@@ -221,5 +221,5 @@ def _date_format_helper(self, date_string):
                 continue
         raise ValueError(
             f"The date you supplied, {date_string}, is not a valid Donorbox format."
-            + "Try the following formats: YYYY-mm-dd YYYY/mm/dd YYYYmmdd dd-mm-YYYY"
+            "Try the following formats: YYYY-mm-dd YYYY/mm/dd YYYYmmdd dd-mm-YYYY"
         )
diff --git a/parsons/geocode/census_geocoder.py b/parsons/geocode/census_geocoder.py
index a816074526..a49c15648e 100644
--- a/parsons/geocode/census_geocoder.py
+++ b/parsons/geocode/census_geocoder.py
@@ -109,7 +109,7 @@ def geocode_address_batch(self, table):
         if set(table.columns) != {"id", "street", "city", "state", "zip"}:
             msg = (
                 "Table must ONLY include `['id', 'street', 'city', 'state', 'zip']` as"
-                + "columns. Tip: try using `table.cut()`"
+                "columns. Tip: try using `table.cut()`"
             )
             raise ValueError(msg)
 
diff --git a/parsons/scytl/scytl.py b/parsons/scytl/scytl.py
index 818b3a8d54..c27c17453e 100644
--- a/parsons/scytl/scytl.py
+++ b/parsons/scytl/scytl.py
@@ -29,7 +29,7 @@
 
 BROWSER_HEADERS = {
     "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_5) "
-    + "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.102 Safari/537.36"
+    "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.102 Safari/537.36"
 }
 
 TZ_INFO = {
diff --git a/pyproject.toml b/pyproject.toml
index e9a0e29360..27d3436152 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -46,8 +46,19 @@ target-version = "py39"
 # Enable Pyflakes (`F`) and a subset of the pycodestyle (`E`)  codes by default.
 # Unlike Flake8, Ruff doesn't enable pycodestyle warnings (`W`) or
 # McCabe complexity (`C901`) by default.
-select = ["E4", "E7", "E9", "F", "I"]
-ignore = []
+select = [
+    "E", # pycodestyle errors
+    "F", # Pyflakes (F)
+    "I", # isort (I)
+    "TID", # flake8-tidy-imports (TID)
+    "ICN", # flake8-import-conventions (ICN)
+    "Q", # flake8-quotes (Q)
+    "TC", # flake8-type-checking (TC)
+    "ISC", # flake8-implicit-str-concat (ISC)
+]
+ignore = [
+    "E501", # line-too-long (E501)
+]
 
 # Allow fix for all enabled rules (when `--fix`) is provided.
 fixable = ["ALL"]
diff --git a/test/conftest.py b/test/conftest.py
deleted file mode 100644
index bfceb7813b..0000000000
--- a/test/conftest.py
+++ /dev/null
@@ -1,4 +0,0 @@
-import pytest
-
-# raise ValueError
-xfail_value_error = pytest.mark.xfail(raises=ValueError, strict=True)
diff --git a/test/test_airmeet.py b/test/test_airmeet.py
index 69229b7c32..5b75c1d628 100644
--- a/test/test_airmeet.py
+++ b/test/test_airmeet.py
@@ -276,7 +276,7 @@ def test_fetch_session_attendance_exception_202(self):
             return_value={
                 "statusCode": 202,
                 "statusMessage": "Preparing your results. Try after 5 minutes"
-                + "to get the updated results",
+                "to get the updated results",
             }
         )
 
diff --git a/test/test_shopify.py b/test/test_shopify.py
index 40f5ec9055..845ca7fe1e 100644
--- a/test/test_shopify.py
+++ b/test/test_shopify.py
@@ -120,23 +120,23 @@ def test_get_query_url(self, m):
         self.assertEqual(
             self.shopify.get_query_url(None, None, "orders", True),
             f"https://{SUBDOMAIN}.myshopify.com/admin/api/{API_VERSION}/orders/"
-            + "count.json?limit=250&status=any",
+            "count.json?limit=250&status=any",
         )
         self.assertEqual(
             self.shopify.get_query_url("2020-10-20", None, "orders", True),
             f"https://{SUBDOMAIN}.myshopify.com/admin/api/{API_VERSION}/orders/"
-            + "count.json?limit=250&status=any&created_at_min=2020-10-20T00:00:00&"
-            + "created_at_max=2020-10-21T00:00:00",
+            "count.json?limit=250&status=any&created_at_min=2020-10-20T00:00:00&"
+            "created_at_max=2020-10-21T00:00:00",
         )
         self.assertEqual(
             self.shopify.get_query_url(None, 2, "orders", True),
             f"https://{SUBDOMAIN}.myshopify.com/admin/api/{API_VERSION}/orders/"
-            + "count.json?limit=250&status=any&since_id=2",
+            "count.json?limit=250&status=any&since_id=2",
         )
         self.assertEqual(
             self.shopify.get_query_url(None, None, "orders", False),
             f"https://{SUBDOMAIN}.myshopify.com/admin/api/{API_VERSION}/orders.json?"
-            + "limit=250&status=any",
+            "limit=250&status=any",
         )
 
     @requests_mock.Mocker()
diff --git a/test/test_utilities.py b/test/test_utilities.py
index a7460ff635..046bcb33bb 100644
--- a/test/test_utilities.py
+++ b/test/test_utilities.py
@@ -11,7 +11,6 @@
 from parsons import Table
 from parsons.utilities import check_env, files, json_format, sql_helpers
 from parsons.utilities.datetime import date_to_timestamp, parse_date
-from test.conftest import xfail_value_error
 
 
 @pytest.mark.parametrize(
@@ -20,7 +19,9 @@
         pytest.param("2018-12-13", 1544659200),
         pytest.param("2018-12-13T00:00:00-08:00", 1544688000),
         pytest.param("", None),
-        pytest.param("2018-12-13 PST", None, marks=[xfail_value_error]),
+        pytest.param(
+            "2018-12-13 PST", None, marks=[pytest.mark.xfail(raises=ValueError, strict=True)]
+        ),
     ],
 )
 def test_date_to_timestamp(date, exp_ts):