diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 1288955272aa..d07fd0e20558 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -815,7 +815,6 @@ in {
   postfix-raise-smtpd-tls-security-level = handleTest ./postfix-raise-smtpd-tls-security-level.nix {};
   postfixadmin = handleTest ./postfixadmin.nix {};
   postgis = handleTest ./postgis.nix {};
-  apache_datasketches = handleTest ./apache_datasketches.nix {};
   postgresql = handleTest ./postgresql.nix {};
   postgresql-jit = handleTest ./postgresql-jit.nix {};
   postgresql-wal-receiver = handleTest ./postgresql-wal-receiver.nix {};
diff --git a/nixos/tests/apache_datasketches.nix b/nixos/tests/apache_datasketches.nix
deleted file mode 100644
index 2bf099ac7991..000000000000
--- a/nixos/tests/apache_datasketches.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-import ./make-test-python.nix ({ pkgs, ...} : {
-  name = "postgis";
-  meta = with pkgs.lib.maintainers; {
-    maintainers = [ lsix ]; # TODO: Who's the maintener now?
-  };
-
-  nodes = {
-    master =
-      { pkgs, ... }:
-
-      {
-        services.postgresql = let mypg = pkgs.postgresql_15; in {
-            enable = true;
-            package = mypg;
-            extraPlugins = with mypg.pkgs; [
-              apache_datasketches
-            ];
-        };
-      };
-  };
-
-  testScript = ''
-    start_all()
-    master.wait_for_unit("postgresql")
-    master.sleep(10)  # Hopefully this is long enough!!
-    master.succeed("sudo -u postgres psql -c 'CREATE EXTENSION datasketches;'")
-    master.succeed("sudo -u postgres psql -c 'SELECT hll_sketch_to_string(hll_sketch_build(1));'")
-  '';
-})
diff --git a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix
index af3df00fca64..750551a9cbfe 100644
--- a/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix
+++ b/pkgs/servers/sql/postgresql/ext/apache_datasketches.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, postgresql, boost182, nixosTests }:
+{ stdenv, lib, fetchFromGitHub, postgresql, boost182, postgresqlTestExtension }:
 
 let
   version = "1.7.0";
@@ -20,7 +20,7 @@ let
   };
 in
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "apache_datasketches";
   inherit version;
 
@@ -61,7 +61,13 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
-  passthru.tests.apache_datasketches = nixosTests.apache_datasketches;
+  passthru.tests.extension = postgresqlTestExtension {
+    inherit (finalAttrs) finalPackage;
+    sql = ''
+      CREATE EXTENSION datasketches;
+      SELECT hll_sketch_to_string(hll_sketch_build(1));
+    '';
+  };
 
   meta = {
     description = "PostgreSQL extension providing approximate algorithms for distinct item counts, quantile estimation and frequent items detection";
@@ -75,4 +81,4 @@ stdenv.mkDerivation {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ mmusnjak ];
   };
-}
+})