ensure tests execute sequentially, shutdown Kamon after each test

2 files changed, 5 insertions, 1 deletions

diff --git a/build.sbt b/build.sbt
index c8fff2c9..ffcfd9d6 100644
--- a/build.sbt
+++ b/build.sbt
@@ -13,6 +13,7 @@
  * =========================================================================================
  */
 
+parallelExecution in Test in Global := false
 
 lazy val kamon = (project in file("."))
   .settings(moduleName := "root")
diff --git a/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala b/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala
index 49bcee68..a615dde4 100644
--- a/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala
+++ b/kamon-core/src/test/scala/kamon/testkit/BaseKamonSpec.scala
@@ -63,5 +63,8 @@ abstract class BaseKamonSpec(actorSystemName: String) extends TestKitBase with W
     subscriptions.tell(SubscriptionsDispatcher.Tick)
   }
 
-  override protected def afterAll(): Unit = system.shutdown()
+  override protected def afterAll(): Unit = {
+    Kamon.shutdown()
+    system.shutdown()
+  }
 }