diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3d71203a..f02e8346 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,8 +48,8 @@ jobs:
           - version: "18"
 
         pair:
-          - elixir: "1.13"
-            otp: "24"
+          - elixir: "1.15"
+            otp: "25"
         include:
           - pg:
               version: "18"
diff --git a/lib/postgrex/extensions/bit_string.ex b/lib/postgrex/extensions/bit_string.ex
index 376f1d3e..afcaf5f9 100644
--- a/lib/postgrex/extensions/bit_string.ex
+++ b/lib/postgrex/extensions/bit_string.ex
@@ -13,7 +13,7 @@ defmodule Postgrex.Extensions.BitString do
       val when is_bitstring(val) ->
         bin_size = byte_size(val)
         last_pos = bin_size - 1
-        <<binary::binary-size(last_pos), last::bits>> = val
+        <<binary::binary-size(^last_pos), last::bits>> = val
         pad = 8 - bit_size(last)
         bit_count = bit_size(val)
 
diff --git a/lib/postgrex/extensions/tsvector.ex b/lib/postgrex/extensions/tsvector.ex
index 4bed64ee..17f282df 100644
--- a/lib/postgrex/extensions/tsvector.ex
+++ b/lib/postgrex/extensions/tsvector.ex
@@ -49,7 +49,7 @@ defmodule Postgrex.Extensions.TSVector do
   def decode_tsvector_values(words) do
     [word, <<positions_count::16, rest::binary>>] = :binary.split(words, <<0>>)
     positions_bytes = positions_count * 2
-    <<positions::binary-size(positions_bytes), remaining_data::binary>> = rest
+    <<positions::binary-size(^positions_bytes), remaining_data::binary>> = rest
 
     positions =
       for <<weight::2, position::14 <- positions>>, do: {position, decode_weight(weight)}
diff --git a/lib/postgrex/messages.ex b/lib/postgrex/messages.ex
index b3c2a359..8f9fbbae 100644
--- a/lib/postgrex/messages.ex
+++ b/lib/postgrex/messages.ex
@@ -95,7 +95,7 @@ defmodule Postgrex.Messages do
 
         :gss_cont ->
           rest_size = size - 2
-          <<data::size(rest_size)>> = rest
+          <<data::size(^rest_size)>> = rest
           data
 
         :sasl ->
diff --git a/lib/postgrex/protocol.ex b/lib/postgrex/protocol.ex
index 8258c77a..31d321a4 100644
--- a/lib/postgrex/protocol.ex
+++ b/lib/postgrex/protocol.ex
@@ -3299,7 +3299,7 @@ defmodule Postgrex.Protocol do
     size = size - 4
 
     case rest do
-      <<body::binary(size), rest::binary>> ->
+      <<body::binary(^size), rest::binary>> ->
         {:ok, parse(body, type, size), rest}
 
       _ ->
diff --git a/lib/postgrex/query.ex b/lib/postgrex/query.ex
index 2a854472..c707de4e 100644
--- a/lib/postgrex/query.ex
+++ b/lib/postgrex/query.ex
@@ -52,8 +52,6 @@ defmodule Postgrex.Query do
 end
 
 defimpl DBConnection.Query, for: Postgrex.Query do
-  require Postgrex.Messages
-
   def parse(%{types: nil, name: name} = query, _) do
     # for query table to match names must be equal
     %{query | name: IO.iodata_to_binary(name)}
diff --git a/mix.exs b/mix.exs
index 5f702ec2..72465b5b 100644
--- a/mix.exs
+++ b/mix.exs
@@ -2,13 +2,13 @@ defmodule Postgrex.Mixfile do
   use Mix.Project
 
   @source_url "https://github.com/elixir-ecto/postgrex"
-  @version "0.21.1"
+  @version "0.22.0-dev"
 
   def project do
     [
       app: :postgrex,
       version: @version,
-      elixir: "~> 1.13",
+      elixir: "~> 1.15",
       deps: deps(),
       name: "Postgrex",
       description: "PostgreSQL driver for Elixir",