diff --git a/.github/workflows/IntegrationTests.yml b/.github/workflows/IntegrationTests.yml
index be30e9b71..e582bfa7e 100644
--- a/.github/workflows/IntegrationTests.yml
+++ b/.github/workflows/IntegrationTests.yml
@@ -18,7 +18,7 @@ jobs:
     name: Format Check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
         with:
           submodules: 'true'
 
@@ -39,7 +39,7 @@ jobs:
           make format-check
 
   linux-tests:
-    name: Linux Tests
+    name: Linux (pg-17)
     needs: format-check
     runs-on: ubuntu-latest
 
@@ -72,7 +72,7 @@ jobs:
       id: cache_key
       working-directory: ./duckdb
       run: |
-        DUCKDB_VERSION=$(git rev-parse --short HEAD)
+        DUCKDB_VERSION=$(git rev-parse --short=10 HEAD)
         KEY="${{ runner.os }}-${{ runner.arch }}-$DUCKDB_VERSION"
         echo "value=${KEY}" >> "${GITHUB_OUTPUT}"
 
@@ -82,15 +82,6 @@ jobs:
         path: ${{ github.workspace }}/ccache
         key: ${{ steps.cache_key.outputs.value }}
 
-    - name: Setup Postgres
-      uses: ikalnytskyi/action-setup-postgres@v8
-      with:
-        postgres-version: 17
-        username: 'postgres'
-        password: 'postgres'
-        database: 'postgres'
-        port: '5432'
-
     - name: Setup vcpkg
       uses: lukka/run-vcpkg@v11.1
       with:
@@ -106,6 +97,15 @@ jobs:
         path: ${{ github.workspace }}/ccache
         key: ${{ steps.cache_key.outputs.value }}
 
+    - name: Setup Postgres
+      uses: ikalnytskyi/action-setup-postgres@v8
+      with:
+        postgres-version: 17
+        username: 'postgres'
+        password: 'postgres'
+        database: 'postgres'
+        port: '5432'
+
     - name: Run tests
       env:
         PGHOST: localhost
@@ -113,7 +113,6 @@ jobs:
         PGUSER: postgres
         PGPASSWORD: postgres
         POSTGRES_TEST_DATABASE_AVAILABLE: 1
-        POSTGRES_TEST_SLOW: 1
         LOCAL_EXTENSION_REPO: 'build/release/repository'
       run: |
         source ./create-postgres-tables.sh
@@ -121,13 +120,17 @@ jobs:
         ./build/release/test/unittest 'test/sql/*'
 
   linux-pgbouncer:
-    name: Linux PgBouncer
+    name: Linux PgBouncer (${{ matrix.postgres.name }})
     needs: linux-tests
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        pg_version: [14, 18]
+        postgres:
+        - name: pg-14
+          version: 14
+        - name: pg-18
+          version: 18
 
     env:
       GEN: ninja
@@ -159,7 +162,7 @@ jobs:
       id: cache_key
       working-directory: ./duckdb
       run: |
-        DUCKDB_VERSION=$(git rev-parse --short HEAD)
+        DUCKDB_VERSION=$(git rev-parse --short=10 HEAD)
         KEY="${{ runner.os }}-${{ runner.arch }}-$DUCKDB_VERSION"
         echo "value=${KEY}" >> "${GITHUB_OUTPUT}"
 
@@ -169,10 +172,19 @@ jobs:
         path: ${{ github.workspace }}/ccache
         key: ${{ steps.cache_key.outputs.value }}
 
+    - name: Setup vcpkg
+      uses: lukka/run-vcpkg@v11.1
+      with:
+        vcpkgGitCommitId: 84bab45d415d22042bd0b9081aea57f362da3f35
+
+    - name: Build extension
+      run: |
+        make release
+
     - name: Setup Postgres
       uses: ikalnytskyi/action-setup-postgres@v8
       with:
-        postgres-version: ${{ matrix.pg_version }}
+        postgres-version: ${{ matrix.postgres.version }}
         username: 'postgres'
         password: 'postgres'
         database: 'postgres'
@@ -198,15 +210,6 @@ jobs:
         sudo cat /etc/pgbouncer/pgbouncer.ini
         sudo systemctl restart pgbouncer
 
-    - name: Setup vcpkg
-      uses: lukka/run-vcpkg@v11.1
-      with:
-        vcpkgGitCommitId: 84bab45d415d22042bd0b9081aea57f362da3f35
-
-    - name: Build extension
-      run: |
-        make release
-
     - name: Setup test data
       env:
         PGHOST: localhost
@@ -224,7 +227,6 @@ jobs:
         PGPASSWORD: postgres
         PGSSLMODE: require
         POSTGRES_TEST_DATABASE_AVAILABLE: 1
-        POSTGRES_TEST_SLOW: 1
         LOCAL_EXTENSION_REPO: 'build/release/repository'
       run: |
         psql -d postgresscanner -c "SELECT * FROM pg_stat_ssl WHERE pid = pg_backend_pid()"
@@ -238,7 +240,6 @@ jobs:
         PGPASSWORD: postgres
         PGSSLMODE: require
         POSTGRES_TEST_DATABASE_AVAILABLE: 1
-        POSTGRES_TEST_SLOW: 1
         LOCAL_EXTENSION_REPO: 'build/release/repository'
       run: |
         psql -d postgresscanner -c "SELECT * FROM pg_stat_ssl WHERE pid = pg_backend_pid()"
@@ -252,14 +253,18 @@ jobs:
         path: |
           /var/log/postgresql/pgbouncer.log
 
-  linux-relassert:
-    name: Linux RelAssert
+  linux-sanitized:
+    name: Linux ${{ matrix.sanitizer.name }} (pg-17)
     needs: linux-tests
     runs-on: ubuntu-latest
 
     strategy:
       matrix:
-        threadsan: [0, 1]
+        sanitizer:
+        - name: ASan
+          threadsan_enabled: 0
+        - name: TSan
+          threadsan_enabled: 1
 
     env:
       CMAKE_BUILD_PARALLEL_LEVEL: 2
@@ -291,7 +296,7 @@ jobs:
       id: cache_key
       working-directory: ./duckdb
       run: |
-        DUCKDB_VERSION=$(git rev-parse --short HEAD)
+        DUCKDB_VERSION=$(git rev-parse --short=10 HEAD)
         KEY="${{ runner.os }}-${{ runner.arch }}-$DUCKDB_VERSION"-relassert-${{ matrix.threadsan }}
         echo "value=${KEY}" >> "${GITHUB_OUTPUT}"
 
@@ -301,16 +306,6 @@ jobs:
         path: ${{ github.workspace }}/ccache
         key: ${{ steps.cache_key.outputs.value }}
 
-    - name: Setup Postgres
-      uses: ikalnytskyi/action-setup-postgres@v8
-      with:
-        postgres-version: 18
-        username: 'postgres'
-        password: 'postgres'
-        database: 'postgres'
-        port: '5432'
-        ssl: true
-
     - name: Setup vcpkg
       uses: lukka/run-vcpkg@v11.1
       with:
@@ -318,7 +313,7 @@ jobs:
 
     - name: Build extension
       env:
-        THREADSAN: ${{ matrix.threadsan }}
+        THREADSAN: ${{ matrix.sanitizer.threadsan_enabled }}
       run: |
         make relassert
         cat ./build/relassert/src/CMakeFiles/duckdb.dir/flags.make
@@ -331,6 +326,16 @@ jobs:
         path: ${{ github.workspace }}/ccache
         key: ${{ steps.cache_key.outputs.value }}
 
+    - name: Setup Postgres
+      uses: ikalnytskyi/action-setup-postgres@v8
+      with:
+        postgres-version: 17
+        username: 'postgres'
+        password: 'postgres'
+        database: 'postgres'
+        port: '5432'
+        ssl: true
+
     - name: Run tests
       env:
         PGHOST: localhost
@@ -343,10 +348,10 @@ jobs:
       run: |
         source ./create-postgres-tables.sh
         psql -d postgresscanner -c "SELECT * FROM pg_stat_ssl WHERE pid = pg_backend_pid()"
-        ./build/relassert/test/unittest 'test/sql/*'
+        ./build/relassert/test/unittest
 
   windows-tests:
-    name: Windows Tests
+    name: Windows (pg-17)
     needs: linux-tests
     runs-on: windows-latest
 
@@ -401,7 +406,7 @@ jobs:
       working-directory: ./duckdb
       shell: bash
       run: |
-        DUCKDB_VERSION=$(git rev-parse --short HEAD)
+        DUCKDB_VERSION=$(git rev-parse --short=10 HEAD)
         KEY="${{ runner.os }}-${{ runner.arch }}-$DUCKDB_VERSION"
         echo "value=${KEY}" >> "${GITHUB_OUTPUT}"
 
@@ -438,7 +443,7 @@ jobs:
     - name: Setup Postgres
       uses: ikalnytskyi/action-setup-postgres@v8
       with:
-        postgres-version: '18'
+        postgres-version: '17'
         username: 'postgres'
         password: 'postgres'
         database: 'postgres'
@@ -468,4 +473,4 @@ jobs:
       shell: bash
       run: |
         psql -d postgresscanner -c "SELECT * FROM pg_stat_ssl WHERE pid = pg_backend_pid()"
-        ./build/release/test/unittest 'test/sql/*'
+        ./build/release/test/unittest
diff --git a/extension_config.cmake b/extension_config.cmake
index 6eb69ab54..04f1fa899 100644
--- a/extension_config.cmake
+++ b/extension_config.cmake
@@ -4,7 +4,6 @@
 duckdb_extension_load(postgres_scanner
     SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}
     DONT_LINK
-    LOAD_TESTS
 )
 
 duckdb_extension_load(tpch)
diff --git a/test/sql/misc/postgres_binary.test b/test/sql/misc/postgres_binary.test
index 44feec1e0..d855f19a8 100644
--- a/test/sql/misc/postgres_binary.test
+++ b/test/sql/misc/postgres_binary.test
@@ -14,13 +14,13 @@ ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
 # straightforward integer copy
 statement ok
-COPY (SELECT i::INT AS i FROM range(100) t(i)) TO '__TEST_DIR__/pg_binary.bin' (FORMAT postgres_binary);
+COPY (SELECT i::INT AS i FROM range(100) t(i)) TO '{TEST_DIR}/pg_binary.bin' (FORMAT postgres_binary);
 
 statement ok
 CREATE OR REPLACE TABLE s.binary_copy_test(i INTEGER);
 
 statement ok
-CALL postgres_execute('s', 'COPY binary_copy_test FROM ''__WORKING_DIRECTORY__/__TEST_DIR__/pg_binary.bin'' (FORMAT binary)')
+CALL postgres_execute('s', 'COPY binary_copy_test FROM ''{WORKING_DIRECTORY}/{TEST_DIR}/pg_binary.bin'' (FORMAT binary)')
 
 query IIII
 SELECT COUNT(*), MIN(i), MAX(i), SUM(i) FROM s.binary_copy_test
@@ -43,10 +43,10 @@ statement ok
 CREATE OR REPLACE TABLE s.binary_copy_test AS FROM all_types_tbl LIMIT 0;
 
 statement ok
-COPY all_types_tbl TO '__TEST_DIR__/pg_binary.bin' (FORMAT postgres_binary);
+COPY all_types_tbl TO '{TEST_DIR}/pg_binary.bin' (FORMAT postgres_binary);
 
 statement ok
-CALL postgres_execute('s', 'COPY binary_copy_test FROM ''__WORKING_DIRECTORY__/__TEST_DIR__/pg_binary.bin'' (FORMAT binary)')
+CALL postgres_execute('s', 'COPY binary_copy_test FROM ''{WORKING_DIRECTORY}/{TEST_DIR}/pg_binary.bin'' (FORMAT binary)')
 
 query I nosort all_types
 FROM all_types_tbl
@@ -59,7 +59,7 @@ SELECT * FROM s.binary_copy_test
 
 # test an unsupported type
 statement error
-COPY (SELECT 42::UINT32) TO '__TEST_DIR__/pg_binary.bin' (FORMAT postgres_binary);
+COPY (SELECT 42::UINT32) TO '{TEST_DIR}/pg_binary.bin' (FORMAT postgres_binary);
 ----
 not supported
 
@@ -68,10 +68,10 @@ statement ok
 CREATE TABLE read_tbl(i int);
 
 statement ok
-COPY (SELECT 42::INTEGER AS i) TO '__TEST_DIR__/pg_binary_read.bin' (FORMAT postgres_binary);
+COPY (SELECT 42::INTEGER AS i) TO '{TEST_DIR}/pg_binary_read.bin' (FORMAT postgres_binary);
 
 statement ok
-COPY read_tbl FROM '__TEST_DIR__/pg_binary_read.bin' (FORMAT postgres_binary);
+COPY read_tbl FROM '{TEST_DIR}/pg_binary_read.bin' (FORMAT postgres_binary);
 
 query I
 SELECT * FROM read_tbl;
diff --git a/test/sql/misc/postgres_binary_read_basic.test b/test/sql/misc/postgres_binary_read_basic.test
index f14039618..34d659bd6 100644
--- a/test/sql/misc/postgres_binary_read_basic.test
+++ b/test/sql/misc/postgres_binary_read_basic.test
@@ -7,111 +7,108 @@ require postgres_scanner
 statement ok
 LOAD postgres_scanner;
 
-statement ok
-PRAGMA enable_verification
-
 # --- BOOLEAN ---
 statement ok
-COPY (SELECT true AS a, false AS b, NULL::BOOLEAN AS c) TO '__TEST_DIR__/bool_test.bin' (FORMAT postgres_binary);
+COPY (SELECT true AS a, false AS b, NULL::BOOLEAN AS c) TO '{TEST_DIR}/bool_test.bin' (FORMAT postgres_binary);
 
 query III
-SELECT * FROM read_postgres_binary('__TEST_DIR__/bool_test.bin', columns={a: 'BOOLEAN', b: 'BOOLEAN', c: 'BOOLEAN'});
+SELECT * FROM read_postgres_binary('{TEST_DIR}/bool_test.bin', columns={a: 'BOOLEAN', b: 'BOOLEAN', c: 'BOOLEAN'});
 ----
 true	false	NULL
 
 # --- SMALLINT ---
 statement ok
-COPY (SELECT 1::SMALLINT AS a, -32767::SMALLINT AS b, 32767::SMALLINT AS c, NULL::SMALLINT AS d) TO '__TEST_DIR__/smallint_test.bin' (FORMAT postgres_binary);
+COPY (SELECT 1::SMALLINT AS a, -32767::SMALLINT AS b, 32767::SMALLINT AS c, NULL::SMALLINT AS d) TO '{TEST_DIR}/smallint_test.bin' (FORMAT postgres_binary);
 
 query IIII
-SELECT * FROM read_postgres_binary('__TEST_DIR__/smallint_test.bin', columns={a: 'SMALLINT', b: 'SMALLINT', c: 'SMALLINT', d: 'SMALLINT'});
+SELECT * FROM read_postgres_binary('{TEST_DIR}/smallint_test.bin', columns={a: 'SMALLINT', b: 'SMALLINT', c: 'SMALLINT', d: 'SMALLINT'});
 ----
 1	-32767	32767	NULL
 
 # --- INTEGER ---
 statement ok
-COPY (SELECT 42::INTEGER AS a, -2147483647::INTEGER AS b, 2147483647::INTEGER AS c, NULL::INTEGER AS d) TO '__TEST_DIR__/int_test.bin' (FORMAT postgres_binary);
+COPY (SELECT 42::INTEGER AS a, -2147483647::INTEGER AS b, 2147483647::INTEGER AS c, NULL::INTEGER AS d) TO '{TEST_DIR}/int_test.bin' (FORMAT postgres_binary);
 
 query IIII
-SELECT * FROM read_postgres_binary('__TEST_DIR__/int_test.bin', columns={a: 'INTEGER', b: 'INTEGER', c: 'INTEGER', d: 'INTEGER'});
+SELECT * FROM read_postgres_binary('{TEST_DIR}/int_test.bin', columns={a: 'INTEGER', b: 'INTEGER', c: 'INTEGER', d: 'INTEGER'});
 ----
 42	-2147483647	2147483647	NULL
 
 # --- BIGINT ---
 statement ok
-COPY (SELECT 100::BIGINT AS a, -9223372036854775807::BIGINT AS b, 9223372036854775807::BIGINT AS c, NULL::BIGINT AS d) TO '__TEST_DIR__/bigint_test.bin' (FORMAT postgres_binary);
+COPY (SELECT 100::BIGINT AS a, -9223372036854775807::BIGINT AS b, 9223372036854775807::BIGINT AS c, NULL::BIGINT AS d) TO '{TEST_DIR}/bigint_test.bin' (FORMAT postgres_binary);
 
 query IIII
-SELECT * FROM read_postgres_binary('__TEST_DIR__/bigint_test.bin', columns={a: 'BIGINT', b: 'BIGINT', c: 'BIGINT', d: 'BIGINT'});
+SELECT * FROM read_postgres_binary('{TEST_DIR}/bigint_test.bin', columns={a: 'BIGINT', b: 'BIGINT', c: 'BIGINT', d: 'BIGINT'});
 ----
 100	-9223372036854775807	9223372036854775807	NULL
 
 # --- FLOAT ---
 statement ok
-COPY (SELECT 3.14::FLOAT AS a, 0::FLOAT AS b, NULL::FLOAT AS c) TO '__TEST_DIR__/float_test.bin' (FORMAT postgres_binary);
+COPY (SELECT 3.14::FLOAT AS a, 0::FLOAT AS b, NULL::FLOAT AS c) TO '{TEST_DIR}/float_test.bin' (FORMAT postgres_binary);
 
 query III
-SELECT * FROM read_postgres_binary('__TEST_DIR__/float_test.bin', columns={a: 'FLOAT', b: 'FLOAT', c: 'FLOAT'});
+SELECT * FROM read_postgres_binary('{TEST_DIR}/float_test.bin', columns={a: 'FLOAT', b: 'FLOAT', c: 'FLOAT'});
 ----
 3.14	0.0	NULL
 
 # --- DOUBLE ---
 statement ok
-COPY (SELECT 2.718281828::DOUBLE AS a, 0::DOUBLE AS b, NULL::DOUBLE AS c) TO '__TEST_DIR__/double_test.bin' (FORMAT postgres_binary);
+COPY (SELECT 2.718281828::DOUBLE AS a, 0::DOUBLE AS b, NULL::DOUBLE AS c) TO '{TEST_DIR}/double_test.bin' (FORMAT postgres_binary);
 
 query III
-SELECT * FROM read_postgres_binary('__TEST_DIR__/double_test.bin', columns={a: 'DOUBLE', b: 'DOUBLE', c: 'DOUBLE'});
+SELECT * FROM read_postgres_binary('{TEST_DIR}/double_test.bin', columns={a: 'DOUBLE', b: 'DOUBLE', c: 'DOUBLE'});
 ----
 2.718281828	0.0	NULL
 
 # --- DECIMAL ---
 statement ok
-COPY (SELECT 1.1::DECIMAL(4,1) AS a, 99.9::DECIMAL(4,1) AS b, NULL::DECIMAL(4,1) AS c) TO '__TEST_DIR__/dec41_test.bin' (FORMAT postgres_binary);
+COPY (SELECT 1.1::DECIMAL(4,1) AS a, 99.9::DECIMAL(4,1) AS b, NULL::DECIMAL(4,1) AS c) TO '{TEST_DIR}/dec41_test.bin' (FORMAT postgres_binary);
 
 query III
-SELECT * FROM read_postgres_binary('__TEST_DIR__/dec41_test.bin', columns={a: 'DECIMAL(4,1)', b: 'DECIMAL(4,1)', c: 'DECIMAL(4,1)'});
+SELECT * FROM read_postgres_binary('{TEST_DIR}/dec41_test.bin', columns={a: 'DECIMAL(4,1)', b: 'DECIMAL(4,1)', c: 'DECIMAL(4,1)'});
 ----
 1.1	99.9	NULL
 
 statement ok
-COPY (SELECT 12345.6789::DECIMAL(9,4) AS a) TO '__TEST_DIR__/dec94_test.bin' (FORMAT postgres_binary);
+COPY (SELECT 12345.6789::DECIMAL(9,4) AS a) TO '{TEST_DIR}/dec94_test.bin' (FORMAT postgres_binary);
 
 query I
-SELECT * FROM read_postgres_binary('__TEST_DIR__/dec94_test.bin', columns={a: 'DECIMAL(9,4)'});
+SELECT * FROM read_postgres_binary('{TEST_DIR}/dec94_test.bin', columns={a: 'DECIMAL(9,4)'});
 ----
 12345.6789
 
 statement ok
-COPY (SELECT 123456789012.123456::DECIMAL(18,6) AS a) TO '__TEST_DIR__/dec186_test.bin' (FORMAT postgres_binary);
+COPY (SELECT 123456789012.123456::DECIMAL(18,6) AS a) TO '{TEST_DIR}/dec186_test.bin' (FORMAT postgres_binary);
 
 query I
-SELECT * FROM read_postgres_binary('__TEST_DIR__/dec186_test.bin', columns={a: 'DECIMAL(18,6)'});
+SELECT * FROM read_postgres_binary('{TEST_DIR}/dec186_test.bin', columns={a: 'DECIMAL(18,6)'});
 ----
 123456789012.123456
 
 # --- VARCHAR ---
 statement ok
-COPY (SELECT 'hello world'::VARCHAR AS a, ''::VARCHAR AS b, NULL::VARCHAR AS c) TO '__TEST_DIR__/varchar_test.bin' (FORMAT postgres_binary);
+COPY (SELECT 'hello world'::VARCHAR AS a, ''::VARCHAR AS b, NULL::VARCHAR AS c) TO '{TEST_DIR}/varchar_test.bin' (FORMAT postgres_binary);
 
 query III
-SELECT * FROM read_postgres_binary('__TEST_DIR__/varchar_test.bin', columns={a: 'VARCHAR', b: 'VARCHAR', c: 'VARCHAR'});
+SELECT * FROM read_postgres_binary('{TEST_DIR}/varchar_test.bin', columns={a: 'VARCHAR', b: 'VARCHAR', c: 'VARCHAR'});
 ----
 hello world	(empty)	NULL
 
 # --- BLOB ---
 statement ok
-COPY (SELECT '\xDEADBEEF'::BLOB AS a, NULL::BLOB AS b) TO '__TEST_DIR__/blob_test.bin' (FORMAT postgres_binary);
+COPY (SELECT '\xDEADBEEF'::BLOB AS a, NULL::BLOB AS b) TO '{TEST_DIR}/blob_test.bin' (FORMAT postgres_binary);
 
 query II
-SELECT * FROM read_postgres_binary('__TEST_DIR__/blob_test.bin', columns={a: 'BLOB', b: 'BLOB'});
+SELECT * FROM read_postgres_binary('{TEST_DIR}/blob_test.bin', columns={a: 'BLOB', b: 'BLOB'});
 ----
 \xDEADBEEF	NULL
 
 # --- UUID ---
 statement ok
-COPY (SELECT 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::UUID AS a, NULL::UUID AS b) TO '__TEST_DIR__/uuid_test.bin' (FORMAT postgres_binary);
+COPY (SELECT 'a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'::UUID AS a, NULL::UUID AS b) TO '{TEST_DIR}/uuid_test.bin' (FORMAT postgres_binary);
 
 query II
-SELECT * FROM read_postgres_binary('__TEST_DIR__/uuid_test.bin', columns={a: 'UUID', b: 'UUID'});
+SELECT * FROM read_postgres_binary('{TEST_DIR}/uuid_test.bin', columns={a: 'UUID', b: 'UUID'});
 ----
 a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11	NULL
diff --git a/test/sql/misc/postgres_binary_read_complex.test b/test/sql/misc/postgres_binary_read_complex.test
index da1b81789..65de94d70 100644
--- a/test/sql/misc/postgres_binary_read_complex.test
+++ b/test/sql/misc/postgres_binary_read_complex.test
@@ -7,41 +7,38 @@ require postgres_scanner
 statement ok
 LOAD postgres_scanner;
 
-statement ok
-PRAGMA enable_verification
-
 # --- INTEGER ARRAY ---
 statement ok
-COPY (SELECT [1, 2, 3]::INTEGER[] AS a, []::INTEGER[] AS b, NULL::INTEGER[] AS c) TO '__TEST_DIR__/int_array_test.bin' (FORMAT postgres_binary);
+COPY (SELECT [1, 2, 3]::INTEGER[] AS a, []::INTEGER[] AS b, NULL::INTEGER[] AS c) TO '{TEST_DIR}/int_array_test.bin' (FORMAT postgres_binary);
 
 query III
-SELECT * FROM read_postgres_binary('__TEST_DIR__/int_array_test.bin', columns={a: 'INTEGER[]', b: 'INTEGER[]', c: 'INTEGER[]'});
+SELECT * FROM read_postgres_binary('{TEST_DIR}/int_array_test.bin', columns={a: 'INTEGER[]', b: 'INTEGER[]', c: 'INTEGER[]'});
 ----
 [1, 2, 3]	[]	NULL
 
 # --- VARCHAR ARRAY ---
 statement ok
-COPY (SELECT ['hello', 'world']::VARCHAR[] AS a, [NULL, 'test']::VARCHAR[] AS b) TO '__TEST_DIR__/varchar_array_test.bin' (FORMAT postgres_binary);
+COPY (SELECT ['hello', 'world']::VARCHAR[] AS a, [NULL, 'test']::VARCHAR[] AS b) TO '{TEST_DIR}/varchar_array_test.bin' (FORMAT postgres_binary);
 
 query II
-SELECT * FROM read_postgres_binary('__TEST_DIR__/varchar_array_test.bin', columns={a: 'VARCHAR[]', b: 'VARCHAR[]'});
+SELECT * FROM read_postgres_binary('{TEST_DIR}/varchar_array_test.bin', columns={a: 'VARCHAR[]', b: 'VARCHAR[]'});
 ----
 [hello, world]	[NULL, test]
 
 # --- STRUCT ---
 statement ok
-COPY (SELECT {'a': 1, 'b': 'hello'}::STRUCT(a INTEGER, b VARCHAR) AS s) TO '__TEST_DIR__/struct_test.bin' (FORMAT postgres_binary);
+COPY (SELECT {'a': 1, 'b': 'hello'}::STRUCT(a INTEGER, b VARCHAR) AS s) TO '{TEST_DIR}/struct_test.bin' (FORMAT postgres_binary);
 
 query I
-SELECT * FROM read_postgres_binary('__TEST_DIR__/struct_test.bin', columns={s: 'STRUCT(a INTEGER, b VARCHAR)'});
+SELECT * FROM read_postgres_binary('{TEST_DIR}/struct_test.bin', columns={s: 'STRUCT(a INTEGER, b VARCHAR)'});
 ----
 {'a': 1, 'b': hello}
 
 # --- STRUCT of LIST ---
 statement ok
-COPY (SELECT {'ids': [1, 2, 3], 'name': 'test'}::STRUCT(ids INTEGER[], name VARCHAR) AS s) TO '__TEST_DIR__/struct_list_test.bin' (FORMAT postgres_binary);
+COPY (SELECT {'ids': [1, 2, 3], 'name': 'test'}::STRUCT(ids INTEGER[], name VARCHAR) AS s) TO '{TEST_DIR}/struct_list_test.bin' (FORMAT postgres_binary);
 
 query I
-SELECT * FROM read_postgres_binary('__TEST_DIR__/struct_list_test.bin', columns={s: 'STRUCT(ids INTEGER[], name VARCHAR)'});
+SELECT * FROM read_postgres_binary('{TEST_DIR}/struct_list_test.bin', columns={s: 'STRUCT(ids INTEGER[], name VARCHAR)'});
 ----
 {'ids': [1, 2, 3], 'name': test}
diff --git a/test/sql/misc/postgres_binary_read_copy_from.test b/test/sql/misc/postgres_binary_read_copy_from.test
index 692e80b3b..f4ec70eec 100644
--- a/test/sql/misc/postgres_binary_read_copy_from.test
+++ b/test/sql/misc/postgres_binary_read_copy_from.test
@@ -7,18 +7,15 @@ require postgres_scanner
 statement ok
 LOAD postgres_scanner;
 
-statement ok
-PRAGMA enable_verification
-
 # --- COPY FROM basic ---
 statement ok
 CREATE TABLE roundtrip_tbl(i INTEGER, v VARCHAR, d DATE, t TIMESTAMP);
 
 statement ok
-COPY (SELECT 42, 'hello', DATE '2024-01-01', TIMESTAMP '2024-01-01 12:00:00') TO '__TEST_DIR__/roundtrip.bin' (FORMAT postgres_binary);
+COPY (SELECT 42, 'hello', DATE '2024-01-01', TIMESTAMP '2024-01-01 12:00:00') TO '{TEST_DIR}/roundtrip.bin' (FORMAT postgres_binary);
 
 statement ok
-COPY roundtrip_tbl FROM '__TEST_DIR__/roundtrip.bin' (FORMAT postgres_binary);
+COPY roundtrip_tbl FROM '{TEST_DIR}/roundtrip.bin' (FORMAT postgres_binary);
 
 query IIII
 SELECT * FROM roundtrip_tbl;
@@ -30,10 +27,10 @@ statement ok
 CREATE TABLE multi_row_tbl(i INTEGER, v VARCHAR);
 
 statement ok
-COPY (SELECT i::INTEGER, 'row_' || i::VARCHAR AS v FROM range(10000) t(i)) TO '__TEST_DIR__/multi_row.bin' (FORMAT postgres_binary);
+COPY (SELECT i::INTEGER, 'row_' || i::VARCHAR AS v FROM range(10000) t(i)) TO '{TEST_DIR}/multi_row.bin' (FORMAT postgres_binary);
 
 statement ok
-COPY multi_row_tbl FROM '__TEST_DIR__/multi_row.bin' (FORMAT postgres_binary);
+COPY multi_row_tbl FROM '{TEST_DIR}/multi_row.bin' (FORMAT postgres_binary);
 
 query IIII
 SELECT COUNT(*), MIN(i), MAX(i), SUM(i) FROM multi_row_tbl;
@@ -42,24 +39,24 @@ SELECT COUNT(*), MIN(i), MAX(i), SUM(i) FROM multi_row_tbl;
 
 # --- read_postgres_binary multi-row ---
 query IIII
-SELECT COUNT(*), MIN(i), MAX(i), SUM(i) FROM read_postgres_binary('__TEST_DIR__/multi_row.bin', columns={i: 'INTEGER', v: 'VARCHAR'});
+SELECT COUNT(*), MIN(i), MAX(i), SUM(i) FROM read_postgres_binary('{TEST_DIR}/multi_row.bin', columns={i: 'INTEGER', v: 'VARCHAR'});
 ----
 10000	0	9999	49995000
 
 # --- Dataset with NULLs interspersed ---
 statement ok
-COPY (SELECT CASE WHEN i % 3 = 0 THEN NULL ELSE i::INTEGER END AS i, CASE WHEN i % 5 = 0 THEN NULL ELSE 'val_' || i::VARCHAR END AS v FROM range(100) t(i)) TO '__TEST_DIR__/nulls.bin' (FORMAT postgres_binary);
+COPY (SELECT CASE WHEN i % 3 = 0 THEN NULL ELSE i::INTEGER END AS i, CASE WHEN i % 5 = 0 THEN NULL ELSE 'val_' || i::VARCHAR END AS v FROM range(100) t(i)) TO '{TEST_DIR}/nulls.bin' (FORMAT postgres_binary);
 
 query II
-SELECT COUNT(*), COUNT(i) FROM read_postgres_binary('__TEST_DIR__/nulls.bin', columns={i: 'INTEGER', v: 'VARCHAR'});
+SELECT COUNT(*), COUNT(i) FROM read_postgres_binary('{TEST_DIR}/nulls.bin', columns={i: 'INTEGER', v: 'VARCHAR'});
 ----
 100	66
 
 # --- Empty result set (header + footer only) ---
 statement ok
-COPY (SELECT 1::INTEGER AS i WHERE false) TO '__TEST_DIR__/empty.bin' (FORMAT postgres_binary);
+COPY (SELECT 1::INTEGER AS i WHERE false) TO '{TEST_DIR}/empty.bin' (FORMAT postgres_binary);
 
 query I
-SELECT COUNT(*) FROM read_postgres_binary('__TEST_DIR__/empty.bin', columns={i: 'INTEGER'});
+SELECT COUNT(*) FROM read_postgres_binary('{TEST_DIR}/empty.bin', columns={i: 'INTEGER'});
 ----
 0
diff --git a/test/sql/misc/postgres_binary_read_errors.test b/test/sql/misc/postgres_binary_read_errors.test
index 6a173ee18..f3ed80d7f 100644
--- a/test/sql/misc/postgres_binary_read_errors.test
+++ b/test/sql/misc/postgres_binary_read_errors.test
@@ -9,21 +9,21 @@ LOAD postgres_scanner;
 
 # --- Non-existent file ---
 statement error
-SELECT * FROM read_postgres_binary('__TEST_DIR__/nonexistent.bin', columns={i: 'INTEGER'});
+SELECT * FROM read_postgres_binary('{TEST_DIR}/nonexistent.bin', columns={i: 'INTEGER'});
 ----
 IO Error:
 
 # --- Invalid file (not postgres binary format) ---
 statement ok
-COPY (SELECT 42) TO '__TEST_DIR__/not_binary.csv' (FORMAT CSV);
+COPY (SELECT 42) TO '{TEST_DIR}/not_binary.csv' (FORMAT CSV);
 
 statement error
-SELECT * FROM read_postgres_binary('__TEST_DIR__/not_binary.csv', columns={i: 'INTEGER'});
+SELECT * FROM read_postgres_binary('{TEST_DIR}/not_binary.csv', columns={i: 'INTEGER'});
 ----
 invalid header
 
 # --- Missing columns parameter ---
 statement error
-SELECT * FROM read_postgres_binary('__TEST_DIR__/not_binary.csv');
+SELECT * FROM read_postgres_binary('{TEST_DIR}/not_binary.csv');
 ----
 read_postgres_binary requires a 'columns' parameter
diff --git a/test/sql/misc/postgres_binary_read_temporal.test b/test/sql/misc/postgres_binary_read_temporal.test
index 68a154f1b..853041a51 100644
--- a/test/sql/misc/postgres_binary_read_temporal.test
+++ b/test/sql/misc/postgres_binary_read_temporal.test
@@ -7,59 +7,56 @@ require postgres_scanner
 statement ok
 LOAD postgres_scanner;
 
-statement ok
-PRAGMA enable_verification
-
 # --- DATE ---
 statement ok
-COPY (SELECT DATE '1992-01-01' AS a, DATE '2000-01-01' AS b, NULL::DATE AS c) TO '__TEST_DIR__/date_test.bin' (FORMAT postgres_binary);
+COPY (SELECT DATE '1992-01-01' AS a, DATE '2000-01-01' AS b, NULL::DATE AS c) TO '{TEST_DIR}/date_test.bin' (FORMAT postgres_binary);
 
 query III
-SELECT * FROM read_postgres_binary('__TEST_DIR__/date_test.bin', columns={a: 'DATE', b: 'DATE', c: 'DATE'});
+SELECT * FROM read_postgres_binary('{TEST_DIR}/date_test.bin', columns={a: 'DATE', b: 'DATE', c: 'DATE'});
 ----
 1992-01-01	2000-01-01	NULL
 
 # --- TIME ---
 statement ok
-COPY (SELECT TIME '12:34:56' AS a, TIME '00:00:00' AS b, NULL::TIME AS c) TO '__TEST_DIR__/time_test.bin' (FORMAT postgres_binary);
+COPY (SELECT TIME '12:34:56' AS a, TIME '00:00:00' AS b, NULL::TIME AS c) TO '{TEST_DIR}/time_test.bin' (FORMAT postgres_binary);
 
 query III
-SELECT * FROM read_postgres_binary('__TEST_DIR__/time_test.bin', columns={a: 'TIME', b: 'TIME', c: 'TIME'});
+SELECT * FROM read_postgres_binary('{TEST_DIR}/time_test.bin', columns={a: 'TIME', b: 'TIME', c: 'TIME'});
 ----
 12:34:56	00:00:00	NULL
 
 # --- TIMESTAMP ---
 statement ok
-COPY (SELECT TIMESTAMP '2000-01-01 12:00:00' AS a, TIMESTAMP '1992-09-20 08:30:00' AS b, NULL::TIMESTAMP AS c) TO '__TEST_DIR__/ts_test.bin' (FORMAT postgres_binary);
+COPY (SELECT TIMESTAMP '2000-01-01 12:00:00' AS a, TIMESTAMP '1992-09-20 08:30:00' AS b, NULL::TIMESTAMP AS c) TO '{TEST_DIR}/ts_test.bin' (FORMAT postgres_binary);
 
 query III
-SELECT * FROM read_postgres_binary('__TEST_DIR__/ts_test.bin', columns={a: 'TIMESTAMP', b: 'TIMESTAMP', c: 'TIMESTAMP'});
+SELECT * FROM read_postgres_binary('{TEST_DIR}/ts_test.bin', columns={a: 'TIMESTAMP', b: 'TIMESTAMP', c: 'TIMESTAMP'});
 ----
 2000-01-01 12:00:00	1992-09-20 08:30:00	NULL
 
 # --- TIMESTAMP WITH TIME ZONE ---
 statement ok
-COPY (SELECT TIMESTAMPTZ '2000-01-01 12:00:00+00' AS a, NULL::TIMESTAMPTZ AS b) TO '__TEST_DIR__/tstz_test.bin' (FORMAT postgres_binary);
+COPY (SELECT TIMESTAMPTZ '2000-01-01 12:00:00+00' AS a, NULL::TIMESTAMPTZ AS b) TO '{TEST_DIR}/tstz_test.bin' (FORMAT postgres_binary);
 
 query II
-SELECT * FROM read_postgres_binary('__TEST_DIR__/tstz_test.bin', columns={a: 'TIMESTAMP WITH TIME ZONE', b: 'TIMESTAMP WITH TIME ZONE'});
+SELECT * FROM read_postgres_binary('{TEST_DIR}/tstz_test.bin', columns={a: 'TIMESTAMP WITH TIME ZONE', b: 'TIMESTAMP WITH TIME ZONE'});
 ----
 2000-01-01 12:00:00+00	NULL
 
 # --- TIME WITH TIME ZONE ---
 statement ok
-COPY (SELECT TIMETZ '12:00:00+05:30' AS a, NULL::TIMETZ AS b) TO '__TEST_DIR__/timetz_test.bin' (FORMAT postgres_binary);
+COPY (SELECT TIMETZ '12:00:00+05:30' AS a, NULL::TIMETZ AS b) TO '{TEST_DIR}/timetz_test.bin' (FORMAT postgres_binary);
 
 query II
-SELECT * FROM read_postgres_binary('__TEST_DIR__/timetz_test.bin', columns={a: 'TIME WITH TIME ZONE', b: 'TIME WITH TIME ZONE'});
+SELECT * FROM read_postgres_binary('{TEST_DIR}/timetz_test.bin', columns={a: 'TIME WITH TIME ZONE', b: 'TIME WITH TIME ZONE'});
 ----
 12:00:00+05:30	NULL
 
 # --- INTERVAL ---
 statement ok
-COPY (SELECT INTERVAL '1 year 2 months 3 days 4 hours 5 minutes 6 seconds' AS a, NULL::INTERVAL AS b) TO '__TEST_DIR__/interval_test.bin' (FORMAT postgres_binary);
+COPY (SELECT INTERVAL '1 year 2 months 3 days 4 hours 5 minutes 6 seconds' AS a, NULL::INTERVAL AS b) TO '{TEST_DIR}/interval_test.bin' (FORMAT postgres_binary);
 
 query II
-SELECT * FROM read_postgres_binary('__TEST_DIR__/interval_test.bin', columns={a: 'INTERVAL', b: 'INTERVAL'});
+SELECT * FROM read_postgres_binary('{TEST_DIR}/interval_test.bin', columns={a: 'INTERVAL', b: 'INTERVAL'});
 ----
 1 year 2 months 3 days 04:05:06	NULL
diff --git a/test/sql/misc/postgres_hstore.test b/test/sql/misc/postgres_hstore.test
index 7f4c228a6..441615cbc 100644
--- a/test/sql/misc/postgres_hstore.test
+++ b/test/sql/misc/postgres_hstore.test
@@ -7,9 +7,6 @@ require postgres_scanner
 statement ok
 LOAD postgres_scanner;
 
-statement ok
-PRAGMA enable_verification
-
 # --- postgres_hstore_get: basic lookups ---
 
 query I
diff --git a/test/sql/scanner/count_star.test b/test/sql/scanner/count_star.test
index 65119b7c0..91f93f688 100644
--- a/test/sql/scanner/count_star.test
+++ b/test/sql/scanner/count_star.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-pragma enable_verification
-
 statement ok
 CALL postgres_attach('dbname=postgresscanner');
 
diff --git a/test/sql/scanner/decimals.test b/test/sql/scanner/decimals.test_slow
similarity index 99%
rename from test/sql/scanner/decimals.test
rename to test/sql/scanner/decimals.test_slow
index ba94e7d69..cab435845 100644
--- a/test/sql/scanner/decimals.test
+++ b/test/sql/scanner/decimals.test_slow
@@ -1,4 +1,4 @@
-# name: test/sql/scanner/decimals.test
+# name: test/sql/scanner/decimals.test_slow
 # description: Exhaustive decimal test (all possible combinations of decimals)
 # group: [scanner]
 
@@ -6,8 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-require-env POSTGRES_TEST_SLOW
-
 statement ok
 CALL postgres_attach('dbname=postgresscanner');
 
diff --git a/test/sql/scanner/interval.test b/test/sql/scanner/interval.test
index de0717945..a05437a7c 100644
--- a/test/sql/scanner/interval.test
+++ b/test/sql/scanner/interval.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-pragma enable_verification
-
 statement ok
 CALL postgres_attach('dbname=postgresscanner');
 
diff --git a/test/sql/scanner/tpcds.test b/test/sql/scanner/tpcds.test
index e56b2eb95..c188b36a9 100644
--- a/test/sql/scanner/tpcds.test
+++ b/test/sql/scanner/tpcds.test
@@ -23,44 +23,44 @@ PRAGMA default_null_order='NULLS LAST'
 loop i 1 9
 
 query I
-PRAGMA tpcds(${i})
+PRAGMA tpcds({i})
 ----
-<FILE>:duckdb/extension/tpcds/dsdgen/answers/sf0.01/0${i}.csv
+<FILE>:duckdb/extension/tpcds/dsdgen/answers/sf0.01/0{i}.csv
 
 endloop
 
 loop i 10 13
 
 query I
-PRAGMA tpcds(${i})
+PRAGMA tpcds({i})
 ----
-<FILE>:duckdb/extension/tpcds/dsdgen/answers/sf0.01/${i}.csv
+<FILE>:duckdb/extension/tpcds/dsdgen/answers/sf0.01/{i}.csv
 
 endloop
 
 loop i 15 64
 
 query I
-PRAGMA tpcds(${i})
+PRAGMA tpcds({i})
 ----
-<FILE>:duckdb/extension/tpcds/dsdgen/answers/sf0.01/${i}.csv
+<FILE>:duckdb/extension/tpcds/dsdgen/answers/sf0.01/{i}.csv
 
 endloop
 
 loop i 65 85
 
 query I
-PRAGMA tpcds(${i})
+PRAGMA tpcds({i})
 ----
-<FILE>:duckdb/extension/tpcds/dsdgen/answers/sf0.01/${i}.csv
+<FILE>:duckdb/extension/tpcds/dsdgen/answers/sf0.01/{i}.csv
 
 endloop
 
 loop i 86 99
 
 query I
-PRAGMA tpcds(${i})
+PRAGMA tpcds({i})
 ----
-<FILE>:duckdb/extension/tpcds/dsdgen/answers/sf0.01/${i}.csv
+<FILE>:duckdb/extension/tpcds/dsdgen/answers/sf0.01/{i}.csv
 
 endloop
diff --git a/test/sql/scanner/tpch.test b/test/sql/scanner/tpch.test_slow
similarity index 60%
rename from test/sql/scanner/tpch.test
rename to test/sql/scanner/tpch.test_slow
index 2747b3900..865c164d6 100644
--- a/test/sql/scanner/tpch.test
+++ b/test/sql/scanner/tpch.test_slow
@@ -1,4 +1,4 @@
-# name: test/sql/scanner/tpch.test
+# name: test/sql/scanner/tpch.test_slow
 # description: Run TPC-H queries over Postgres tables
 # group: [scanner]
 
@@ -8,25 +8,23 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-require-env POSTGRES_TEST_SLOW
-
 statement ok
 CALL postgres_attach('dbname=postgresscanner', source_schema='tpch', filter_pushdown=true);
 
 loop i 1 9
 
 query I
-PRAGMA tpch(${i})
+PRAGMA tpch({i})
 ----
-<FILE>:duckdb/extension/tpch/dbgen/answers/sf0.01/q0${i}.csv
+<FILE>:duckdb/extension/tpch/dbgen/answers/sf0.01/q0{i}.csv
 
 endloop
 
 loop i 10 23
 
 query I
-PRAGMA tpch(${i})
+PRAGMA tpch({i})
 ----
-<FILE>:duckdb/extension/tpch/dbgen/answers/sf0.01/q${i}.csv
+<FILE>:duckdb/extension/tpch/dbgen/answers/sf0.01/q{i}.csv
 
 endloop
diff --git a/test/sql/storage/alter_add_column_default.test b/test/sql/storage/alter_add_column_default.test
index e9b49361c..544461c53 100644
--- a/test/sql/storage/alter_add_column_default.test
+++ b/test/sql/storage/alter_add_column_default.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_alter.test b/test/sql/storage/attach_alter.test
index 69a1cce4e..5a5043055 100644
--- a/test/sql/storage/attach_alter.test
+++ b/test/sql/storage/attach_alter.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_alter_rollback.test b/test/sql/storage/attach_alter_rollback.test
index 05ecaa25c..860ec7d90 100644
--- a/test/sql/storage/attach_alter_rollback.test
+++ b/test/sql/storage/attach_alter_rollback.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_array_binary_copy.test b/test/sql/storage/attach_array_binary_copy.test
index dc502ff99..12cede241 100644
--- a/test/sql/storage/attach_array_binary_copy.test
+++ b/test/sql/storage/attach_array_binary_copy.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_backslash.test b/test/sql/storage/attach_backslash.test
index 0ab0b10b8..b44ba7abe 100644
--- a/test/sql/storage/attach_backslash.test
+++ b/test/sql/storage/attach_backslash.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 SET pg_use_binary_copy=false;
 
diff --git a/test/sql/storage/attach_case_sensitive_columns.test b/test/sql/storage/attach_case_sensitive_columns.test
index 89c67256d..33e2b65b4 100644
--- a/test/sql/storage/attach_case_sensitive_columns.test
+++ b/test/sql/storage/attach_case_sensitive_columns.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_case_sensitive_tables.test b/test/sql/storage/attach_case_sensitive_tables.test
index 88fb66edf..d799c9751 100644
--- a/test/sql/storage/attach_case_sensitive_tables.test
+++ b/test/sql/storage/attach_case_sensitive_tables.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_checkpoint.test b/test/sql/storage/attach_checkpoint.test
index 8bd123211..e885cb18b 100644
--- a/test/sql/storage/attach_checkpoint.test
+++ b/test/sql/storage/attach_checkpoint.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_concurrent_queries.test b/test/sql/storage/attach_concurrent_queries.test
index 1a2806d0a..852602f0f 100644
--- a/test/sql/storage/attach_concurrent_queries.test
+++ b/test/sql/storage/attach_concurrent_queries.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
@@ -27,7 +24,7 @@ concurrentloop i 0 10
 loop k 0 10
 
 statement ok
-INSERT INTO s.concurrent VALUES (${i} + ${k})
+INSERT INTO s.concurrent VALUES ({i} + {k})
 
 endloop
 
diff --git a/test/sql/storage/attach_connection_pool.test_slow b/test/sql/storage/attach_connection_pool.test_slow
index fe3053772..56f0d7f77 100644
--- a/test/sql/storage/attach_connection_pool.test_slow
+++ b/test/sql/storage/attach_connection_pool.test_slow
@@ -6,11 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-require-env POSTGRES_TEST_SLOW
-
-statement ok
-PRAGMA enable_verification
-
 statement ok
 SET pg_connection_cache=true
 
diff --git a/test/sql/storage/attach_connection_pool_configure.test b/test/sql/storage/attach_connection_pool_configure.test
index 73b25e5da..b606f6cb6 100644
--- a/test/sql/storage/attach_connection_pool_configure.test
+++ b/test/sql/storage/attach_connection_pool_configure.test
@@ -8,9 +8,6 @@ require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
 require-env POSTGRES_TEST_TEMPORARY_DISABLED
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS loader (TYPE POSTGRES);
 
diff --git a/test/sql/storage/attach_connection_pool_options.test b/test/sql/storage/attach_connection_pool_options.test
index 16660bbf4..4c1841be4 100644
--- a/test/sql/storage/attach_connection_pool_options.test
+++ b/test/sql/storage/attach_connection_pool_options.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES);
 
diff --git a/test/sql/storage/attach_constraints.test b/test/sql/storage/attach_constraints.test
index fa6c9b497..a6fd08775 100644
--- a/test/sql/storage/attach_constraints.test
+++ b/test/sql/storage/attach_constraints.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_copy_from_database.test b/test/sql/storage/attach_copy_from_database.test
index 8e68ec3e1..823e48c09 100644
--- a/test/sql/storage/attach_copy_from_database.test
+++ b/test/sql/storage/attach_copy_from_database.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES)
 
@@ -24,7 +21,7 @@ USE s1.copy_schema
 foreach table_name pg_numtypes pg_bytetypes pg_datetypes
 
 statement ok
-CREATE TABLE ${table_name} AS FROM public.${table_name}
+CREATE TABLE {table_name} AS FROM public.{table_name}
 
 endloop
 
@@ -50,7 +47,7 @@ statement ok
 create view my_view as select min(id) from copy_schema.big_tbl
 
 statement ok
-ATTACH '__TEST_DIR__/copy_database.db' AS new_db;
+ATTACH '{TEST_DIR}/copy_database.db' AS new_db;
 
 statement ok
 COPY FROM DATABASE s1 TO new_db
@@ -58,7 +55,7 @@ COPY FROM DATABASE s1 TO new_db
 foreach table_name pg_numtypes pg_bytetypes pg_datetypes big_tbl my_view
 
 query I
-SELECT COUNT(*) FROM (FROM new_db.copy_schema.${table_name} EXCEPT FROM ${table_name})
+SELECT COUNT(*) FROM (FROM new_db.copy_schema.{table_name} EXCEPT FROM {table_name})
 ----
 0
 
diff --git a/test/sql/storage/attach_create_if_exists.test b/test/sql/storage/attach_create_if_exists.test
index d058d569c..639593625 100644
--- a/test/sql/storage/attach_create_if_exists.test
+++ b/test/sql/storage/attach_create_if_exists.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_create_index.test b/test/sql/storage/attach_create_index.test
index c229bf2a0..d28065ff6 100644
--- a/test/sql/storage/attach_create_index.test
+++ b/test/sql/storage/attach_create_index.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_create_uppercase_names.test b/test/sql/storage/attach_create_uppercase_names.test
index bf6ca5ed3..907ed2633 100644
--- a/test/sql/storage/attach_create_uppercase_names.test
+++ b/test/sql/storage/attach_create_uppercase_names.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_database_list.test b/test/sql/storage/attach_database_list.test
index 7472f5da6..15a2842e0 100644
--- a/test/sql/storage/attach_database_list.test
+++ b/test/sql/storage/attach_database_list.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_database_size.test b/test/sql/storage/attach_database_size.test
index 60dbd8afa..5b316c3d3 100644
--- a/test/sql/storage/attach_database_size.test
+++ b/test/sql/storage/attach_database_size.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_defaults.test b/test/sql/storage/attach_defaults.test
index b753cc159..ff0cc2451 100644
--- a/test/sql/storage/attach_defaults.test
+++ b/test/sql/storage/attach_defaults.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_delete.test b/test/sql/storage/attach_delete.test
index 33ca0d154..986cdca70 100644
--- a/test/sql/storage/attach_delete.test
+++ b/test/sql/storage/attach_delete.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_describe.test b/test/sql/storage/attach_describe.test
index e69901c98..2c478b0f4 100644
--- a/test/sql/storage/attach_describe.test
+++ b/test/sql/storage/attach_describe.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_detach.test b/test/sql/storage/attach_detach.test
index 8b660f94d..9a90bcb74 100644
--- a/test/sql/storage/attach_detach.test
+++ b/test/sql/storage/attach_detach.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_drop.test b/test/sql/storage/attach_drop.test
index 518b5aa18..e9e0addad 100644
--- a/test/sql/storage/attach_drop.test
+++ b/test/sql/storage/attach_drop.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS simple (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_early_connection_release.test b/test/sql/storage/attach_early_connection_release.test
index a30d40eb9..ded364c02 100644
--- a/test/sql/storage/attach_early_connection_release.test
+++ b/test/sql/storage/attach_early_connection_release.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES);
 
diff --git a/test/sql/storage/attach_existing_constraints.test b/test/sql/storage/attach_existing_constraints.test
index 61b1d9fbc..a2139fbc6 100644
--- a/test/sql/storage/attach_existing_constraints.test
+++ b/test/sql/storage/attach_existing_constraints.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES, READ_ONLY)
 
diff --git a/test/sql/storage/attach_existing_enum.test b/test/sql/storage/attach_existing_enum.test
index b2c3d2d27..267c53561 100644
--- a/test/sql/storage/attach_existing_enum.test
+++ b/test/sql/storage/attach_existing_enum.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_existing_multidimensional_array.test b/test/sql/storage/attach_existing_multidimensional_array.test
index 86ee25486..5fc34f775 100644
--- a/test/sql/storage/attach_existing_multidimensional_array.test
+++ b/test/sql/storage/attach_existing_multidimensional_array.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_filter_pushdown.test b/test/sql/storage/attach_filter_pushdown.test
index 2809beba4..4d01031ba 100644
--- a/test/sql/storage/attach_filter_pushdown.test
+++ b/test/sql/storage/attach_filter_pushdown.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_geometry.test b/test/sql/storage/attach_geometry.test
index 43d3efaf1..6681859b2 100644
--- a/test/sql/storage/attach_geometry.test
+++ b/test/sql/storage/attach_geometry.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_giant_numeric.test b/test/sql/storage/attach_giant_numeric.test
index 64f70681c..1f85debfc 100644
--- a/test/sql/storage/attach_giant_numeric.test
+++ b/test/sql/storage/attach_giant_numeric.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_if_not_exists.test b/test/sql/storage/attach_if_not_exists.test
index 54349fc76..1626080d7 100644
--- a/test/sql/storage/attach_if_not_exists.test
+++ b/test/sql/storage/attach_if_not_exists.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_insert_from_scan_large.test b/test/sql/storage/attach_insert_from_scan_large.test
index 8b26d76b0..dd2adc0c8 100644
--- a/test/sql/storage/attach_insert_from_scan_large.test
+++ b/test/sql/storage/attach_insert_from_scan_large.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_isolation_level.test b/test/sql/storage/attach_isolation_level.test
index 21fe79af5..b660fbde1 100644
--- a/test/sql/storage/attach_isolation_level.test
+++ b/test/sql/storage/attach_isolation_level.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES, ISOLATION_LEVEL 'READ COMMITTED')
 
diff --git a/test/sql/storage/attach_issue_146.test b/test/sql/storage/attach_issue_146.test
index fb4650a8e..1e1839890 100644
--- a/test/sql/storage/attach_issue_146.test
+++ b/test/sql/storage/attach_issue_146.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS postgres_db (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_json.test b/test/sql/storage/attach_json.test
index a7ffc1ed6..ddacbb638 100644
--- a/test/sql/storage/attach_json.test
+++ b/test/sql/storage/attach_json.test
@@ -8,9 +8,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS postgres_db (TYPE POSTGRES, READ_WRITE)
 
diff --git a/test/sql/storage/attach_keywords.test b/test/sql/storage/attach_keywords.test
index 8c01fab68..f8f7813fe 100644
--- a/test/sql/storage/attach_keywords.test
+++ b/test/sql/storage/attach_keywords.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_large_delete.test_slow b/test/sql/storage/attach_large_delete.test_slow
index 3ce26f970..0e12d7444 100644
--- a/test/sql/storage/attach_large_delete.test_slow
+++ b/test/sql/storage/attach_large_delete.test_slow
@@ -6,11 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-require-env POSTGRES_TEST_SLOW
-
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES);
 
diff --git a/test/sql/storage/attach_like.test b/test/sql/storage/attach_like.test
index 87961f0e8..e3b9f5b3e 100644
--- a/test/sql/storage/attach_like.test
+++ b/test/sql/storage/attach_like.test
@@ -8,9 +8,6 @@ require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
 require-env POSTGRES_TEST_TEMPORARY_DISABLED
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_list_tables.test b/test/sql/storage/attach_list_tables.test
index f496cb4ae..3faa5cc44 100644
--- a/test/sql/storage/attach_list_tables.test
+++ b/test/sql/storage/attach_list_tables.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_main_schema.test b/test/sql/storage/attach_main_schema.test
index e850937b8..5d9120d6a 100644
--- a/test/sql/storage/attach_main_schema.test
+++ b/test/sql/storage/attach_main_schema.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_merge.test b/test/sql/storage/attach_merge.test
index 092b65354..9d8d19cc6 100644
--- a/test/sql/storage/attach_merge.test
+++ b/test/sql/storage/attach_merge.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES);
 
diff --git a/test/sql/storage/attach_multi_join.test b/test/sql/storage/attach_multi_join.test
index 4226de960..6123976d5 100644
--- a/test/sql/storage/attach_multi_join.test
+++ b/test/sql/storage/attach_multi_join.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_multi_join_large.test_slow b/test/sql/storage/attach_multi_join_large.test_slow
index fdb6cd16e..8b0525c85 100644
--- a/test/sql/storage/attach_multi_join_large.test_slow
+++ b/test/sql/storage/attach_multi_join_large.test_slow
@@ -6,11 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-require-env POSTGRES_TEST_SLOW
-
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_non_existent.test b/test/sql/storage/attach_non_existent.test
index 8fc52cfbe..ca95fa5c5 100644
--- a/test/sql/storage/attach_non_existent.test
+++ b/test/sql/storage/attach_non_existent.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement error
 ATTACH 'dbname=dbdoesnotexistx' AS s1 (TYPE POSTGRES)
 ----
diff --git a/test/sql/storage/attach_null_byte.test b/test/sql/storage/attach_null_byte.test
index 280fee385..bee36f819 100644
--- a/test/sql/storage/attach_null_byte.test
+++ b/test/sql/storage/attach_null_byte.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES)
 
@@ -18,7 +15,7 @@ USE s1
 foreach pg_binary true false
 
 statement ok
-SET pg_use_binary_copy=${pg_binary}
+SET pg_use_binary_copy={pg_binary}
 
 statement ok
 CREATE OR REPLACE TABLE nullbyte_tbl(s VARCHAR);
diff --git a/test/sql/storage/attach_on_conflict.test b/test/sql/storage/attach_on_conflict.test
index 101463a59..3df4c5f56 100644
--- a/test/sql/storage/attach_on_conflict.test
+++ b/test/sql/storage/attach_on_conflict.test
@@ -5,18 +5,12 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES);
 
 statement ok
 USE s
 
-statement ok
-PRAGMA enable_verification;
-
 statement ok
 CREATE OR REPLACE TABLE tbl(
 	i INT PRIMARY KEY,
diff --git a/test/sql/storage/attach_pages_per_task.test_slow b/test/sql/storage/attach_pages_per_task.test_slow
index c2378df20..351752031 100644
--- a/test/sql/storage/attach_pages_per_task.test_slow
+++ b/test/sql/storage/attach_pages_per_task.test_slow
@@ -6,11 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-require-env POSTGRES_TEST_SLOW
-
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES);
 
diff --git a/test/sql/storage/attach_postgis.test b/test/sql/storage/attach_postgis.test
index 5a3cde405..f2c54ad17 100644
--- a/test/sql/storage/attach_postgis.test
+++ b/test/sql/storage/attach_postgis.test
@@ -9,9 +9,6 @@ require-env POSTGRES_TEST_DATABASE_AVAILABLE
 # This is just to disable the test until we figure out how to get PostGIS in the CI
 require-env HAS_POSTGIS
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgres' AS s (TYPE POSTGRES);
 
diff --git a/test/sql/storage/attach_postgres_execute.test b/test/sql/storage/attach_postgres_execute.test
index 9dda5a452..32b25cb88 100644
--- a/test/sql/storage/attach_postgres_execute.test
+++ b/test/sql/storage/attach_postgres_execute.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES);
 
diff --git a/test/sql/storage/attach_prefix.test b/test/sql/storage/attach_prefix.test
index 54a19aa92..2ec220652 100644
--- a/test/sql/storage/attach_prefix.test
+++ b/test/sql/storage/attach_prefix.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'postgres:dbname=postgresscanner' AS s
 
diff --git a/test/sql/storage/attach_rds_iam.test b/test/sql/storage/attach_rds_iam.test
index 362d33755..e969ee98c 100644
--- a/test/sql/storage/attach_rds_iam.test
+++ b/test/sql/storage/attach_rds_iam.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env AWS_RDS_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 LOAD postgres
 
diff --git a/test/sql/storage/attach_read_only.test b/test/sql/storage/attach_read_only.test
index b6afbc650..fe3abc6f9 100644
--- a/test/sql/storage/attach_read_only.test
+++ b/test/sql/storage/attach_read_only.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES, READ_ONLY)
 
diff --git a/test/sql/storage/attach_schema_param.test b/test/sql/storage/attach_schema_param.test
index 2c7f2ad69..9a333a432 100644
--- a/test/sql/storage/attach_schema_param.test
+++ b/test/sql/storage/attach_schema_param.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES, SCHEMA 'some_schema')
 
diff --git a/test/sql/storage/attach_schemas.test b/test/sql/storage/attach_schemas.test
index a0e261efd..94d9bbfdd 100644
--- a/test/sql/storage/attach_schemas.test
+++ b/test/sql/storage/attach_schemas.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_secret.test b/test/sql/storage/attach_secret.test
index 96c5361a4..ecf7ca4b8 100644
--- a/test/sql/storage/attach_secret.test
+++ b/test/sql/storage/attach_secret.test
@@ -8,9 +8,6 @@ require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
 require-env POSTGRES_TEST_TEMPORARY_DISABLED
 
-statement ok
-PRAGMA enable_verification
-
 # attach using default secret
 statement ok
 CREATE SECRET (
diff --git a/test/sql/storage/attach_secret_storage.test b/test/sql/storage/attach_secret_storage.test
index c242e8ea0..23175b5bf 100644
--- a/test/sql/storage/attach_secret_storage.test
+++ b/test/sql/storage/attach_secret_storage.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 # Clean up any leftover secrets from previous test runs by attaching, dropping table, and reattaching
 statement ok
 ATTACH 'dbname=postgresscanner' AS pg_cleanup (TYPE POSTGRES)
diff --git a/test/sql/storage/attach_show_all_tables.test b/test/sql/storage/attach_show_all_tables.test
index 8037d884d..1627b34b0 100644
--- a/test/sql/storage/attach_show_all_tables.test
+++ b/test/sql/storage/attach_show_all_tables.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_simple.test b/test/sql/storage/attach_simple.test
index 5b1d418f9..2ff5b4a0b 100644
--- a/test/sql/storage/attach_simple.test
+++ b/test/sql/storage/attach_simple.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS simple (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_temporary_table.test b/test/sql/storage/attach_temporary_table.test
index b520a099b..4e4ab3bb5 100644
--- a/test/sql/storage/attach_temporary_table.test
+++ b/test/sql/storage/attach_temporary_table.test
@@ -8,9 +8,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'postgres:dbname=postgresscanner' AS s
 
diff --git a/test/sql/storage/attach_text_array.test b/test/sql/storage/attach_text_array.test
index 55927bc4f..b95155702 100644
--- a/test/sql/storage/attach_text_array.test
+++ b/test/sql/storage/attach_text_array.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS simple (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_transactions.test b/test/sql/storage/attach_transactions.test
index d72e6b1ad..495028643 100644
--- a/test/sql/storage/attach_transactions.test
+++ b/test/sql/storage/attach_transactions.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_types.test b/test/sql/storage/attach_types.test
index 4a0697940..78fe024fc 100644
--- a/test/sql/storage/attach_types.test
+++ b/test/sql/storage/attach_types.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
@@ -74,10 +71,10 @@ NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL
 foreach column_name bool tinyint smallint int bigint utinyint usmallint uint date time timestamp timestamp_s timestamp_ms timestamp_ns time_tz timestamp_tz dec_4_1 dec_9_4 dec_18_6 dec38_10 uuid interval varchar blob bit small_enum medium_enum large_enum int_array double_array date_array timestamp_array timestamptz_array varchar_array
 
 statement ok
-SET VARIABLE minimum_value=(SELECT MIN(${column_name}) min_val FROM s.all_types);
+SET VARIABLE minimum_value=(SELECT MIN({column_name}) min_val FROM s.all_types);
 
 query I
-SELECT ANY_VALUE(${column_name})=getvariable('minimum_value') FROM s.all_types WHERE ${column_name}=getvariable('minimum_value')
+SELECT ANY_VALUE({column_name})=getvariable('minimum_value') FROM s.all_types WHERE {column_name}=getvariable('minimum_value')
 ----
 true
 
diff --git a/test/sql/storage/attach_types_blob.test b/test/sql/storage/attach_types_blob.test
index da3ef8e4a..faad34505 100644
--- a/test/sql/storage/attach_types_blob.test
+++ b/test/sql/storage/attach_types_blob.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_types_char.test b/test/sql/storage/attach_types_char.test
index 44c9e2a19..9160b6b9d 100644
--- a/test/sql/storage/attach_types_char.test
+++ b/test/sql/storage/attach_types_char.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_types_complex_composite.test b/test/sql/storage/attach_types_complex_composite.test
index 4128a1553..fe68cb754 100644
--- a/test/sql/storage/attach_types_complex_composite.test
+++ b/test/sql/storage/attach_types_complex_composite.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_types_date.test b/test/sql/storage/attach_types_date.test
index 552cebbaf..629940539 100644
--- a/test/sql/storage/attach_types_date.test
+++ b/test/sql/storage/attach_types_date.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_types_decimal.test b/test/sql/storage/attach_types_decimal.test
index 5f74efbdd..1d8844f10 100644
--- a/test/sql/storage/attach_types_decimal.test
+++ b/test/sql/storage/attach_types_decimal.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_types_enum.test b/test/sql/storage/attach_types_enum.test
index 6c52d4bb3..fdae4a705 100644
--- a/test/sql/storage/attach_types_enum.test
+++ b/test/sql/storage/attach_types_enum.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_types_interval.test b/test/sql/storage/attach_types_interval.test
index e82606e5e..e9fd77229 100644
--- a/test/sql/storage/attach_types_interval.test
+++ b/test/sql/storage/attach_types_interval.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_types_json.test b/test/sql/storage/attach_types_json.test
index 49c4ecbb4..9652ae4cc 100644
--- a/test/sql/storage/attach_types_json.test
+++ b/test/sql/storage/attach_types_json.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_types_lists.test b/test/sql/storage/attach_types_lists.test
index 7c177bcf4..94d69add0 100644
--- a/test/sql/storage/attach_types_lists.test
+++ b/test/sql/storage/attach_types_lists.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
@@ -19,7 +16,7 @@ USE s;
 foreach type SMALLINT INT BIGINT
 
 statement ok
-CREATE OR REPLACE TABLE lists(i ${type}[]);
+CREATE OR REPLACE TABLE lists(i {type}[]);
 
 statement ok
 INSERT INTO lists VALUES ([1, 2, 3]);
@@ -47,7 +44,7 @@ endloop
 foreach type FLOAT DOUBLE
 
 statement ok
-CREATE OR REPLACE TABLE lists(i ${type}[]);
+CREATE OR REPLACE TABLE lists(i {type}[]);
 
 statement ok
 INSERT INTO lists VALUES ([1, 2, 3]);
@@ -159,7 +156,7 @@ NULL
 foreach type TIMESTAMP TIMESTAMP_MS TIMESTAMP_NS TIMESTAMP_S
 
 statement ok
-CREATE OR REPLACE TABLE lists(ts ${type}[]);
+CREATE OR REPLACE TABLE lists(ts {type}[]);
 
 statement ok
 INSERT INTO lists VALUES ([TIMESTAMP '2010-01-01 01:23:45', TIMESTAMP 'infinity', TIMESTAMP '-infinity']);
diff --git a/test/sql/storage/attach_types_macaddr.test b/test/sql/storage/attach_types_macaddr.test
index c2859aa44..9b5d99772 100644
--- a/test/sql/storage/attach_types_macaddr.test
+++ b/test/sql/storage/attach_types_macaddr.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_types_multidimensional_array.test b/test/sql/storage/attach_types_multidimensional_array.test
index 6d4cb6308..79c4f0c6a 100644
--- a/test/sql/storage/attach_types_multidimensional_array.test
+++ b/test/sql/storage/attach_types_multidimensional_array.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_types_numerics.test b/test/sql/storage/attach_types_numerics.test
index 32cca269b..848cf19d9 100644
--- a/test/sql/storage/attach_types_numerics.test
+++ b/test/sql/storage/attach_types_numerics.test
@@ -6,16 +6,13 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
 foreach type TINYINT SMALLINT INTEGER BIGINT HUGEINT UTINYINT USMALLINT UINTEGER UBIGINT FLOAT DOUBLE
 
 statement ok
-CREATE OR REPLACE TABLE s.numerics(i ${type});
+CREATE OR REPLACE TABLE s.numerics(i {type});
 
 statement ok
 INSERT INTO s.numerics VALUES (0);
diff --git a/test/sql/storage/attach_types_struct.test b/test/sql/storage/attach_types_struct.test
index 4a65d9a9a..3dc50f796 100644
--- a/test/sql/storage/attach_types_struct.test
+++ b/test/sql/storage/attach_types_struct.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_types_table_row.test b/test/sql/storage/attach_types_table_row.test
index cbb26820d..0a5cf8766 100644
--- a/test/sql/storage/attach_types_table_row.test
+++ b/test/sql/storage/attach_types_table_row.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_types_time.test b/test/sql/storage/attach_types_time.test
index 379133dbb..470d16259 100644
--- a/test/sql/storage/attach_types_time.test
+++ b/test/sql/storage/attach_types_time.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_types_timestamp.test b/test/sql/storage/attach_types_timestamp.test
index d94518046..a6b2d13ed 100644
--- a/test/sql/storage/attach_types_timestamp.test
+++ b/test/sql/storage/attach_types_timestamp.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_types_uuid.test b/test/sql/storage/attach_types_uuid.test
index 7d978a8bf..b92094e9a 100644
--- a/test/sql/storage/attach_types_uuid.test
+++ b/test/sql/storage/attach_types_uuid.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_types_varchar.test b/test/sql/storage/attach_types_varchar.test
index 1d8b12587..c6ba6ee5c 100644
--- a/test/sql/storage/attach_types_varchar.test
+++ b/test/sql/storage/attach_types_varchar.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_ubigint.test b/test/sql/storage/attach_ubigint.test
index d5814a3e3..d65d10433 100644
--- a/test/sql/storage/attach_ubigint.test
+++ b/test/sql/storage/attach_ubigint.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_update.test b/test/sql/storage/attach_update.test
index 977a91ee1..70df6098e 100644
--- a/test/sql/storage/attach_update.test
+++ b/test/sql/storage/attach_update.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_upper_case.test b/test/sql/storage/attach_upper_case.test
index 013265436..e01978259 100644
--- a/test/sql/storage/attach_upper_case.test
+++ b/test/sql/storage/attach_upper_case.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_use_binary_copy.test b/test/sql/storage/attach_use_binary_copy.test
index e5b69193b..b689c2b3f 100644
--- a/test/sql/storage/attach_use_binary_copy.test
+++ b/test/sql/storage/attach_use_binary_copy.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_varchar_list_nulls.test b/test/sql/storage/attach_varchar_list_nulls.test
index 7423c7b0e..7ce76858d 100644
--- a/test/sql/storage/attach_varchar_list_nulls.test
+++ b/test/sql/storage/attach_varchar_list_nulls.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/attach_verify_big_table.test_slow b/test/sql/storage/attach_verify_big_table.test_slow
index 9c36d7d10..0b4620380 100644
--- a/test/sql/storage/attach_verify_big_table.test_slow
+++ b/test/sql/storage/attach_verify_big_table.test_slow
@@ -6,14 +6,9 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-require-env POSTGRES_TEST_SLOW
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s1 (TYPE POSTGRES)
 
-statement ok
-PRAGMA enable_verification
-
 loop i 0 10
 
 query II
diff --git a/test/sql/storage/attach_views.test b/test/sql/storage/attach_views.test
index b5145f5d9..c5279c050 100644
--- a/test/sql/storage/attach_views.test
+++ b/test/sql/storage/attach_views.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/bug136.test b/test/sql/storage/bug136.test
index fc3c9033f..b48b8ffe4 100644
--- a/test/sql/storage/bug136.test
+++ b/test/sql/storage/bug136.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/postgres_execute_transaction.test b/test/sql/storage/postgres_execute_transaction.test
index 5bc33930c..b78d090fe 100644
--- a/test/sql/storage/postgres_execute_transaction.test
+++ b/test/sql/storage/postgres_execute_transaction.test
@@ -8,9 +8,6 @@ require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
 require-env POSTGRES_TEST_TEMPORARY_DISABLED
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/postgres_execute_use_transaction.test b/test/sql/storage/postgres_execute_use_transaction.test
index 2744afcae..5257dd3a6 100644
--- a/test/sql/storage/postgres_execute_use_transaction.test
+++ b/test/sql/storage/postgres_execute_use_transaction.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)
 
diff --git a/test/sql/storage/postgres_query_use_transaction.test b/test/sql/storage/postgres_query_use_transaction.test
index b566e4230..108e00c70 100644
--- a/test/sql/storage/postgres_query_use_transaction.test
+++ b/test/sql/storage/postgres_query_use_transaction.test
@@ -6,9 +6,6 @@ require postgres_scanner
 
 require-env POSTGRES_TEST_DATABASE_AVAILABLE
 
-statement ok
-PRAGMA enable_verification
-
 statement ok
 ATTACH 'dbname=postgresscanner' AS s (TYPE POSTGRES)