diff --git a/.lintr b/.lintr
index 41b22f67..bb028bce 100644
--- a/.lintr
+++ b/.lintr
@@ -1,10 +1,10 @@
 linters: linters_with_defaults(
   line_length_linter = line_length_linter(120L),
   object_name_linter = object_name_linter(styles = c("snake_case", "symbols", "CamelCase")),
-  cyclocomp_linter = NULL, # Issues with R6 classes.
   object_length_linter(32L),
   indentation_linter = indentation_linter(hanging_indent_style = "tidy"),
-  return_linter = NULL
+  return_linter = NULL,
+  pipe_consistency_linter = pipe_consistency_linter("auto")
   )
 exclusions: list(
   "tests/testthat/2024.07.0/",
diff --git a/tests/integrated/helper.R b/tests/integrated/helper.R
index 5d5d4c2b..78dae128 100644
--- a/tests/integrated/helper.R
+++ b/tests/integrated/helper.R
@@ -9,7 +9,8 @@ expect_ptype_equal <- function(actual, expected, exact = TRUE) {
 }
 
 skip_if_connect_older_than <- function(client, version) {
-  if (numeric_version(safe_server_version(client)) < numeric_version(version)) {
+  current <- numeric_version(simplify_version(safe_server_version(client)))
+  if (current < numeric_version(version)) {
     skip(paste("Requires Connect >=", version))
   }
 }
diff --git a/tests/testthat/test-utils.R b/tests/testthat/test-utils.R
index 6ed18821..b436a7ce 100644
--- a/tests/testthat/test-utils.R
+++ b/tests/testthat/test-utils.R
@@ -3,6 +3,7 @@ test_that("simplify_version works", {
   expect_identical(simplify_version("1.8.2.1-4"), "1.8.2")
   expect_identical(simplify_version("10.70.204.1-4"), "10.70.204")
   expect_identical(simplify_version("10.0.0.0-4"), "10.0.0")
+  expect_identical(simplify_version("2026.01.0-dev+15-z596093a50w"), "2026.01.0")
 })
 
 test_that("compare_connect_version works", {