diff --git a/samba.yaml b/samba.yaml
index df7552fb0dd..9293422b68d 100644
--- a/samba.yaml
+++ b/samba.yaml
@@ -1,7 +1,7 @@
 package:
   name: samba
   version: 4.21.3
-  epoch: 1
+  epoch: 2
   description: "Tools to access a server's filespace and printers via SMB"
   copyright:
     - license: GPL-3.0-or-later AND LGPL-3.0-or-later
@@ -199,6 +199,11 @@ subpackages:
           mkdir -p "${{targets.contextdir}}"/usr/lib
           mv "${{targets.destdir}}"/usr/lib/samba/smbspool_krb5_wrapper "${{targets.contextdir}}"/usr/lib
     test:
+      environment:
+        contents:
+          packages:
+            - samba-server
+            - libauth-samba
       pipeline:
         - runs: |
             dbwrap_tool --version
@@ -220,6 +225,13 @@ subpackages:
             smbget --help
             smbtree --version
             smbtree --help
+        - name: Test Samba client
+          runs: |
+            mkdir -p /var/lib/samba/private/ /var/log/samba /var/run/samba /etc/samba
+            touch /etc/samba/smb.conf
+            smbd
+            sleep 1
+            smbclient -L 127.0.0.1
 
   - name: samba-server-libs
     description: Samba libraries shared by server and windbind