diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,5 @@
-Copyright (c) 2011-2018 Simon Hengel <sol@typeful.net>
-Copyright (c) 2011-2012 Trystan Spangler <trystan.s@comcast.net>
-Copyright (c) 2011-2011 Greg Weber <greg@gregweber.info>
+Copyright (c) 2014-2022 Simon Hengel <sol@typeful.net>
+Copyright (c) 2014-2014 Junji Hashimoto <junji.hashimoto@gree.net>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/hspec-contrib.cabal b/hspec-contrib.cabal
--- a/hspec-contrib.cabal
+++ b/hspec-contrib.cabal
@@ -1,59 +1,62 @@
-name:             hspec-contrib
-version:          0.5.1
-license:          MIT
-license-file:     LICENSE
-copyright:        (c) 2011-2018 Simon Hengel,
-                  (c) 2014 Junji Hashimoto
+cabal-version: 1.12
 
-maintainer:       Simon Hengel <sol@typeful.net>
-build-type:       Simple
-cabal-version:    >= 1.10
-category:         Testing
-stability:        experimental
-bug-reports:      https://github.com/hspec/hspec/issues
-homepage:         http://hspec.github.io/
-synopsis:         Contributed functionality for Hspec
-description:      Contributed functionality for Hspec
+-- This file has been generated from package.yaml by hpack version 0.35.0.
+--
+-- see: https://github.com/sol/hpack
 
+name:           hspec-contrib
+version:        0.5.1.1
+license:        MIT
+license-file:   LICENSE
+copyright:      (c) 2011-2022 Simon Hengel,
+                (c) 2014 Junji Hashimoto
+maintainer:     Simon Hengel <sol@typeful.net>
+build-type:     Simple
+category:       Testing
+stability:      experimental
+bug-reports:    https://github.com/hspec/hspec/issues
+homepage:       http://hspec.github.io/
+synopsis:       Contributed functionality for Hspec
+description:    Contributed functionality for Hspec
+
 source-repository head
   type: git
   location: https://github.com/hspec/hspec
   subdir: hspec-contrib
 
 library
-  ghc-options:
-      -Wall
+  ghc-options: -Wall
   hs-source-dirs:
       src
   build-depends:
-      base == 4.*
-    , hspec-core >= 2.5.0
-    , HUnit
+      HUnit
+    , base ==4.*
+    , hspec-core >=2.5.0
   exposed-modules:
-      Test.Hspec.Contrib.Retry
       Test.Hspec.Contrib.HUnit
+      Test.Hspec.Contrib.Retry
   other-modules:
+      Paths_hspec_contrib
   default-language: Haskell2010
 
 test-suite spec
-  type:
-      exitcode-stdio-1.0
+  type: exitcode-stdio-1.0
   hs-source-dirs:
       test
-  main-is:
-      Spec.hs
+  main-is: Spec.hs
   other-modules:
       Helper
-      Test.Hspec.Contrib.RetrySpec
       Test.Hspec.Contrib.HUnitSpec
-  ghc-options:
-      -Wall
+      Test.Hspec.Contrib.RetrySpec
+      Paths_hspec_contrib
+  ghc-options: -Wall
+  build-tool-depends:
+      hspec-discover:hspec-discover
   build-depends:
-      base == 4.*
-    , hspec-core
-    , HUnit
-
-    , hspec-contrib
-    , hspec
+      HUnit
     , QuickCheck
+    , base ==4.*
+    , hspec
+    , hspec-contrib
+    , hspec-core >=2.6.0
   default-language: Haskell2010
diff --git a/test/Test/Hspec/Contrib/HUnitSpec.hs b/test/Test/Hspec/Contrib/HUnitSpec.hs
--- a/test/Test/Hspec/Contrib/HUnitSpec.hs
+++ b/test/Test/Hspec/Contrib/HUnitSpec.hs
@@ -8,7 +8,7 @@
 import           Test.HUnit
 
 shouldYield :: Test -> [Tree () String] -> Expectation
-a `shouldYield` b = map (bimapTree (const ()) itemRequirement) <$> runSpecM (fromHUnitTest a) `shouldReturn` b
+a `shouldYield` b = bimapForest (const ()) itemRequirement . snd <$> runSpecM (fromHUnitTest a) `shouldReturn` b
 
 spec :: Spec
 spec = do