diff --git a/pkgs/applications/networking/cluster/nomad/generic.nix b/pkgs/applications/networking/cluster/nomad/generic.nix
index f4ddc038d2b6..99a2585272c8 100644
--- a/pkgs/applications/networking/cluster/nomad/generic.nix
+++ b/pkgs/applications/networking/cluster/nomad/generic.nix
@@ -6,6 +6,7 @@
 , nvidiaGpuSupport
 , patchelf
 , nvidia_x11
+, nixosTests
 }:
 
 buildGoPackage rec {
@@ -29,16 +30,7 @@ buildGoPackage rec {
   # ui:
   #  Nomad release commits include the compiled version of the UI, but the file
   #  is only included if we build with the ui tag.
-  preBuild =
-    let
-      tags = [ "ui" ] ++ lib.optional (!nvidiaGpuSupport) "nonvidia";
-      tagsString = lib.concatStringsSep " " tags;
-    in
-    ''
-      export buildFlagsArray=(
-        -tags="${tagsString}"
-      )
-    '';
+  tags = [ "ui" ] ++ lib.optional (!nvidiaGpuSupport) "nonvidia";
 
   # The dependency on NVML isn't explicit. We have to make it so otherwise the
   # binary will not know where to look for the relevant symbols.
@@ -48,6 +40,8 @@ buildGoPackage rec {
     done
   '';
 
+  passthru.tests.nomad = nixosTests.nomad;
+
   meta = with lib; {
     homepage = "https://www.nomadproject.io/";
     description = "A Distributed, Highly Available, Datacenter-Aware Scheduler";
diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index e5b8b370ff33..346141ca8925 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -21,7 +21,7 @@ buildGoModule rec {
 
   nativeBuildInputs = [ installShellFiles makeWrapper ];
 
-  buildFlagsArray = [ "-tags=vault" ];
+  tags = [ "vault" ];
 
   ldflags = [
     "-s" "-w"