diff --git a/.scala-steward.conf b/.scala-steward.conf
index d448051..9eada26 100644
--- a/.scala-steward.conf
+++ b/.scala-steward.conf
@@ -1,5 +1,5 @@
 updates.pin = [ 
-  { groupId = "ch.qos.logback", artifactId = "logback-classic", version = "1.3." },
+  { groupId = "ch.qos.logback", artifactId = "logback-classic", version = "1.2." },
   { groupId = "co.fs2", version = "2." },
   { groupId = "org.typelevel", artifactId="cats-effect-laws", version = "2." },
   { groupId = "org.typelevel", artifactId="cats-effect", version = "2." }
diff --git a/build.sbt b/build.sbt
index a96b3db..ff5fab8 100644
--- a/build.sbt
+++ b/build.sbt
@@ -43,7 +43,8 @@ lazy val core = (project in file("core"))
     libraryDependencies ++= Seq(
       logback,
       specs2Core % Test
-    )
+    ),
+    tpolecatScalacOptions ~= { _ -- Set(ScalacOptions.warnNonUnitStatement, ScalacOptions.warnUnusedNoWarn) },
   )
 
 lazy val scalaTestFs2 = (crossProject(JVMPlatform, JSPlatform) in file("scalatest-fs2"))
@@ -59,6 +60,7 @@ lazy val scalaTestFs2 = (crossProject(JVMPlatform, JSPlatform) in file("scalates
       SjsMacroTaskExecutor.value,
     ),
     addCompilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1"),
+    tpolecatScalacOptions ~= { _ -- Set(ScalacOptions.warnNonUnitStatement, ScalacOptions.warnUnusedNoWarn) },
   )
   .jsSettings(
     libraryDependencies += SjsSecureRandom.value,
@@ -74,6 +76,7 @@ lazy val specs2Akka = (project in file("specs2-akka"))
       akkaActor,
       akkaTestKit,
     ),
+    tpolecatScalacOptions ~= { _ -- Set(ScalacOptions.warnNonUnitStatement, ScalacOptions.warnUnusedNoWarn) },
   )
   .dependsOn(specs2)
 
@@ -86,6 +89,7 @@ lazy val specs2 = (project in file("specs2"))
       specs2Matchers % Test,
       scalaLogging % Test,
     ),
+    tpolecatScalacOptions ~= { _ -- Set(ScalacOptions.warnNonUnitStatement, ScalacOptions.warnUnusedNoWarn) },
   )
   .dependsOn(core)
 
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 0b878bb..39d778e 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -6,7 +6,7 @@ object Dependencies {
 
   val SjsMacroTaskExecutor = Def.setting("org.scala-js" %%% "scala-js-macrotask-executor" % "1.0.0")
   val SjsSecureRandom = Def.setting("org.scala-js" %%% "scalajs-java-securerandom" % "1.0.0")
-  val logback = "ch.qos.logback" % "logback-classic" % "1.3.5"
+  val logback = "ch.qos.logback" % "logback-classic" % "1.2.11"
   val specs2Core = "org.specs2" %% "specs2-core" % "4.19.2"
   val specs2Mock = "org.specs2" %% "specs2-mock" % specs2Core.revision
   val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.6.19"
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 2ef95e2..9cac4c0 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -2,5 +2,5 @@ addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.11")
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.13.0")
 addSbtPlugin("org.portable-scala" % "sbt-crossproject" % "1.2.0")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.2.0")
-addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.1")
+addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.2")
 addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.14.2")
diff --git a/specs2-akka/src/main/scala/com/dwolla/testutils/akka/AkkaTestKitSpecs2Support.scala b/specs2-akka/src/main/scala/com/dwolla/testutils/akka/AkkaTestKitSpecs2Support.scala
index 6a75689..a91dbbb 100644
--- a/specs2-akka/src/main/scala/com/dwolla/testutils/akka/AkkaTestKitSpecs2Support.scala
+++ b/specs2-akka/src/main/scala/com/dwolla/testutils/akka/AkkaTestKitSpecs2Support.scala
@@ -13,5 +13,9 @@ class AkkaTestKitSpecs2Support(config: Option[Config] = None)(implicit execution
   def after: Unit = TestKit.shutdownActorSystem(system)
 
   private def safeTypeName: String = enclosingClassName(this.getClass)
-  @tailrec private def enclosingClassName(clazz: Class[_]): String = if (clazz.isLocalClass) enclosingClassName(clazz.getEnclosingClass) else clazz.getSimpleName
+  @tailrec private def enclosingClassName(clazz: Class[_]): String =
+    if (clazz.isLocalClass || clazz.isAnonymousClass)
+      enclosingClassName(clazz.getEnclosingClass)
+    else
+      clazz.getSimpleName
 }