diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## 0.3.2.0 - 2022-05-17
+
+### Added
+
+ - Nix 2.8 support
+
 ## 0.3.1.2 - 2022-04-08
 
 ### Fixed
diff --git a/hercules-ci-cnix-expr.cabal b/hercules-ci-cnix-expr.cabal
--- a/hercules-ci-cnix-expr.cabal
+++ b/hercules-ci-cnix-expr.cabal
@@ -1,7 +1,7 @@
 cabal-version: 2.4
 
 name:           hercules-ci-cnix-expr
-version:        0.3.1.2
+version:        0.3.2.0
 synopsis:       Bindings for the Nix evaluator
 category:       Nix, CI, Testing, DevOps
 homepage:       https://docs.hercules-ci.com
@@ -25,6 +25,10 @@
   type: git
   location: https://github.com/hercules-ci/hercules-ci-agent
 
+flag nix-2_8
+  description: Build for Nix >=2.8
+  default: True
+
 -- Deprecated
 flag nix-2_4
   description: Build for Nix >=2.4pre*
@@ -115,6 +119,10 @@
       nix-store >= 2.4
     , nix-expr >= 2.4
     , nix-main >= 2.4
+  if flag(nix-2_8)
+    pkgconfig-depends:
+      -- MixEvalArgs has moved here
+      nix-cmd >= 2.8
 
 
 test-suite hercules-ci-cnix-expr-tests
diff --git a/test/TestMain.hs b/test/TestMain.hs
--- a/test/TestMain.hs
+++ b/test/TestMain.hs
@@ -4,7 +4,7 @@
 import Protolude
 import SingleState
 import qualified Spec
-import System.Environment (getEnvironment, setEnv)
+import System.Environment (setEnv)
 import System.FilePath ((</>))
 import System.IO.Temp (withSystemTempDirectory)
 import System.Mem (performMajorGC)
@@ -37,6 +37,4 @@
     setEnv "XDG_CONFIG_HOME" (home </> ".config")
     setEnv "XDG_DATA_HOME" (home </> ".local" </> "share")
 
-    getEnvironment >>= traverse_ \(k, v) ->
-      putStrLn (k <> " = " <> v)
     io