diff --git a/api/src/test/scala/global/namespace/fun/io/api/FilterSpec.scala b/api/src/test/scala/global/namespace/fun/io/api/FilterSpec.scala
index 43ea513..b2acc56 100644
--- a/api/src/test/scala/global/namespace/fun/io/api/FilterSpec.scala
+++ b/api/src/test/scala/global/namespace/fun/io/api/FilterSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017 Schlichtherle IT Services
+ * Copyright © 2017 - 2019 Schlichtherle IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,12 +17,12 @@ package global.namespace.fun.io.api
 
 import java.io.{InputStream, OutputStream}
 
-import Filter._
+import global.namespace.fun.io.api.Filter._
 import org.mockito.ArgumentMatchers.any
-import org.mockito.Mockito.{inOrder, when}
+import org.mockito.Mockito.when
 import org.scalatest.Matchers.{inOrder => _, _}
 import org.scalatest.WordSpec
-import org.scalatest.mockito.MockitoSugar.mock
+import org.scalatestplus.mockito.MockitoSugar.mock
 
 /**
   * @author Christian Schlichtherle
@@ -59,20 +59,20 @@ class FilterSpec extends WordSpec {
         val oss1 = mock[Socket[OutputStream]]
         val oss2 = mock[Socket[OutputStream]]
 
-        when(s output ()) thenReturn oss1
+        when(s.output()) thenReturn oss1
         when(f output oss1) thenReturn oss2
 
-        fs output () shouldBe oss2
+        fs.output() shouldBe oss2
       }
 
       "apply to the input" in {
         val iss1 = mock[Socket[InputStream]]
         val iss2 = mock[Socket[InputStream]]
 
-        when(s input ()) thenReturn iss1
+        when(s.input()) thenReturn iss1
         when(f input iss1) thenReturn iss2
 
-        fs input () shouldBe iss2
+        fs.input() shouldBe iss2
       }
     }
 
diff --git a/api/src/test/scala/global/namespace/fun/io/api/InternalSpec.scala b/api/src/test/scala/global/namespace/fun/io/api/InternalSpec.scala
index 11cbf3a..9fc5622 100644
--- a/api/src/test/scala/global/namespace/fun/io/api/InternalSpec.scala
+++ b/api/src/test/scala/global/namespace/fun/io/api/InternalSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017 Schlichtherle IT Services
+ * Copyright © 2017 - 2019 Schlichtherle IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ import org.mockito.ArgumentMatchers._
 import org.mockito.Mockito._
 import org.scalatest.Matchers.{inOrder => _, _}
 import org.scalatest.WordSpec
-import org.scalatest.mockito.MockitoSugar.mock
+import org.scalatestplus.mockito.MockitoSugar.mock
 
 class InternalSpec extends WordSpec {
 
@@ -36,7 +36,7 @@ class InternalSpec extends WordSpec {
         val io = inOrder(a, b)
         io verify a output any[Socket[OutputStream]]
         io verify b output any[Socket[OutputStream]]
-        io verifyNoMoreInteractions ()
+        io.verifyNoMoreInteractions()
       }
 
       "being unapplied" in {
@@ -44,7 +44,7 @@ class InternalSpec extends WordSpec {
         val io = inOrder(a, b)
         io verify a input any[Socket[InputStream]]
         io verify b input any[Socket[InputStream]]
-        io verifyNoMoreInteractions ()
+        io.verifyNoMoreInteractions()
       }
     }
   }
diff --git a/aws-sdk1/src/test/scala/global/namespace/fun/io/aws/sdk1/AWSSpec.scala b/aws-sdk1/src/test/scala/global/namespace/fun/io/aws/sdk1/AWSSpec.scala
index bf9cd1c..f8e8a17 100644
--- a/aws-sdk1/src/test/scala/global/namespace/fun/io/aws/sdk1/AWSSpec.scala
+++ b/aws-sdk1/src/test/scala/global/namespace/fun/io/aws/sdk1/AWSSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017 Schlichtherle IT Services
+ * Copyright © 2017 - 2019 Schlichtherle IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@ import com.amazonaws.services.s3.AmazonS3
 import global.namespace.fun.io.aws.sdk1.AWS.s3
 import org.scalatest.Matchers._
 import org.scalatest.WordSpec
-import org.scalatest.mockito.MockitoSugar._
-import org.scalatest.prop.PropertyChecks._
+import org.scalatestplus.mockito.MockitoSugar._
+import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks._
 
 class AWSSpec extends WordSpec {
 
diff --git a/aws-sdk2/src/test/scala/global/namespace/fun/io/aws/sdk2/AWSSpec.scala b/aws-sdk2/src/test/scala/global/namespace/fun/io/aws/sdk2/AWSSpec.scala
index 05e8961..4077bab 100644
--- a/aws-sdk2/src/test/scala/global/namespace/fun/io/aws/sdk2/AWSSpec.scala
+++ b/aws-sdk2/src/test/scala/global/namespace/fun/io/aws/sdk2/AWSSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017 Schlichtherle IT Services
+ * Copyright © 2017 - 2019 Schlichtherle IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@ package global.namespace.fun.io.aws.sdk2
 import global.namespace.fun.io.aws.sdk2.AWS.s3
 import org.scalatest.Matchers._
 import org.scalatest.WordSpec
-import org.scalatest.mockito.MockitoSugar._
-import org.scalatest.prop.PropertyChecks._
+import org.scalatestplus.mockito.MockitoSugar._
+import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks._
 import software.amazon.awssdk.services.s3.S3Client
 
 class AWSSpec extends WordSpec {
diff --git a/bios/src/test/scala/global/namespace/fun/io/bios/BIOSSpec.scala b/bios/src/test/scala/global/namespace/fun/io/bios/BIOSSpec.scala
index e31ed8c..93b4cca 100644
--- a/bios/src/test/scala/global/namespace/fun/io/bios/BIOSSpec.scala
+++ b/bios/src/test/scala/global/namespace/fun/io/bios/BIOSSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017 Schlichtherle IT Services
+ * Copyright © 2017 - 2019 Schlichtherle IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ import global.namespace.fun.io.bios.BIOS._
 import org.mockito.Mockito._
 import org.scalatest.Matchers._
 import org.scalatest.WordSpec
-import org.scalatest.mockito.MockitoSugar.mock
+import org.scalatestplus.mockito.MockitoSugar.mock
 
 class BIOSSpec extends WordSpec {
 
@@ -32,8 +32,8 @@ class BIOSSpec extends WordSpec {
         val in = mock[InputStream]
         val source = stream(in)
         source acceptReader (_.read)
-        verify(in) read ()
-        verify(in, never) close ()
+        verify(in).read()
+        verify(in, never).close()
       }
 
       "given an output stream" in {
@@ -41,8 +41,8 @@ class BIOSSpec extends WordSpec {
         val sink = stream(out)
         sink acceptWriter ((_: OutputStream) write 0)
         verify(out) write 0
-        verify(out) flush ()
-        verify(out, never) close ()
+        verify(out).flush()
+        verify(out, never).close()
       }
     }
   }
diff --git a/bios/src/test/scala/global/namespace/fun/io/bios/DirectoryStoreSpec.scala b/bios/src/test/scala/global/namespace/fun/io/bios/DirectoryStoreSpec.scala
index 9388acd..ec5ddce 100644
--- a/bios/src/test/scala/global/namespace/fun/io/bios/DirectoryStoreSpec.scala
+++ b/bios/src/test/scala/global/namespace/fun/io/bios/DirectoryStoreSpec.scala
@@ -1,6 +1,17 @@
 /*
- * Copyright (C) 2013-2018 Schlichtherle IT Services.
- * All rights reserved. Use is subject to license terms.
+ * Copyright © 2017 - 2019 Schlichtherle IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package global.namespace.fun.io.bios
 
@@ -8,9 +19,9 @@ import java.nio.file.Paths
 
 import org.scalatest.Matchers._
 import org.scalatest.WordSpec
-import org.scalatest.prop.PropertyChecks._
+import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks._
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 /** @author Christian Schlichtherle */
 class DirectoryStoreSpec extends WordSpec {
diff --git a/delta/src/test/scala/global/namespace/fun/io/delta/DeltaModelCodecSpec.scala b/delta/src/test/scala/global/namespace/fun/io/delta/DeltaModelCodecSpec.scala
index 85683f6..782d5ca 100644
--- a/delta/src/test/scala/global/namespace/fun/io/delta/DeltaModelCodecSpec.scala
+++ b/delta/src/test/scala/global/namespace/fun/io/delta/DeltaModelCodecSpec.scala
@@ -1,22 +1,33 @@
 /*
- * Copyright (C) 2013-2018 Schlichtherle IT Services.
- * All rights reserved. Use is subject to license terms.
+ * Copyright © 2017 - 2019 Schlichtherle IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package global.namespace.fun.io.delta
 
 import java.nio.charset.Charset
 import java.security.MessageDigest
 
+import global.namespace.fun.io.api.Store
+import global.namespace.fun.io.bios.BIOS.memory
 import global.namespace.fun.io.delta.Delta._
 import global.namespace.fun.io.delta.DeltaModelCodecSpec._
 import global.namespace.fun.io.delta.model.{DeltaModel, EntryNameAndDigestValue, EntryNameAndTwoDigestValues}
-import global.namespace.fun.io.api.Store
-import global.namespace.fun.io.bios.BIOS.memory
 import org.scalatest.Matchers._
 import org.scalatest.WordSpec
-import org.scalatest.prop.PropertyChecks._
+import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks._
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 /** @author Christian Schlichtherle */
 class DeltaModelCodecSpec extends WordSpec {
diff --git a/delta/src/test/scala/global/namespace/fun/io/delta/MessageDigestsSpec.scala b/delta/src/test/scala/global/namespace/fun/io/delta/MessageDigestsSpec.scala
index 3304e3d..8ee7321 100644
--- a/delta/src/test/scala/global/namespace/fun/io/delta/MessageDigestsSpec.scala
+++ b/delta/src/test/scala/global/namespace/fun/io/delta/MessageDigestsSpec.scala
@@ -1,13 +1,24 @@
 /*
- * Copyright (C) 2013-2018 Schlichtherle IT Services.
- * All rights reserved. Use is subject to license terms.
+ * Copyright © 2017 - 2019 Schlichtherle IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package global.namespace.fun.io.delta
 
 import global.namespace.fun.io.delta.MessageDigests._
 import org.scalatest.Matchers._
 import org.scalatest.WordSpec
-import org.scalatest.prop.PropertyChecks._
+import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks._
 
 /** @author Christian Schlichtherle */
 class MessageDigestsSpec extends WordSpec {
diff --git a/it/src/test/scala/global/namespace/fun/io/it/ArchiveSpecContext.scala b/it/src/test/scala/global/namespace/fun/io/it/ArchiveSpecContext.scala
index 35d5793..b37f72d 100644
--- a/it/src/test/scala/global/namespace/fun/io/it/ArchiveSpecContext.scala
+++ b/it/src/test/scala/global/namespace/fun/io/it/ArchiveSpecContext.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017 Schlichtherle IT Services
+ * Copyright © 2017 - 2019 Schlichtherle IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@ trait ArchiveSpecContext {
 
   def withTempArchiveFile(factory: ArchiveStoreFactory)(test: ArchiveStore => Any): Unit = {
     val file = File.createTempFile("tmp", null)
-    file delete ()
+    file.delete()
     try {
       test(factory(file))
     } finally {
@@ -50,7 +50,7 @@ trait ArchiveSpecContext {
   }
 
   private def deleteAll(file: File): Unit = {
-    Option(file listFiles ()) foreach (_ foreach deleteAll)
-    file delete ()
+    Option(file.listFiles()) foreach (_ foreach deleteAll)
+    file.delete()
   }
 }
diff --git a/it/src/test/scala/global/namespace/fun/io/it/ArchiveSpecSuite.scala b/it/src/test/scala/global/namespace/fun/io/it/ArchiveSpecSuite.scala
index 60ca24c..0ee37b2 100644
--- a/it/src/test/scala/global/namespace/fun/io/it/ArchiveSpecSuite.scala
+++ b/it/src/test/scala/global/namespace/fun/io/it/ArchiveSpecSuite.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017 Schlichtherle IT Services
+ * Copyright © 2017 - 2019 Schlichtherle IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,9 +20,9 @@ import global.namespace.fun.io.delta.Delta.diff
 import global.namespace.fun.io.spi.Copy.copy
 import org.scalatest.Matchers._
 import org.scalatest.WordSpec
-import org.scalatest.prop.PropertyChecks._
+import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks._
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 /** @author Christian Schlichtherle */
 abstract class ArchiveSpecSuite extends WordSpec with ArchiveSpecContext {
diff --git a/it/src/test/scala/global/namespace/fun/io/it/ContentSpec.scala b/it/src/test/scala/global/namespace/fun/io/it/ContentSpec.scala
index be257dc..659a2c5 100644
--- a/it/src/test/scala/global/namespace/fun/io/it/ContentSpec.scala
+++ b/it/src/test/scala/global/namespace/fun/io/it/ContentSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017 Schlichtherle IT Services
+ * Copyright © 2017 - 2019 Schlichtherle IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ import global.namespace.fun.io.bios.BIOS._
 import global.namespace.fun.io.scala.api._
 import org.scalatest.Matchers._
 import org.scalatest.WordSpec
-import org.scalatest.prop.PropertyChecks._
+import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks._
 
 class ContentSpec extends WordSpec {
 
@@ -35,7 +35,7 @@ class ContentSpec extends WordSpec {
         () => memory,
         () => file {
           val file = File.createTempFile("tmp", null)
-          file delete ()
+          file.delete()
           file
         },
         () => path {
@@ -63,7 +63,7 @@ class ContentSpec extends WordSpec {
           new String(store content 3) shouldBe "123"
           intercept[ContentTooLargeException](store content 2)
 
-          store delete()
+          store.delete()
           store.exists shouldBe false
           intercept[IOException](store.content)
 
@@ -72,7 +72,7 @@ class ContentSpec extends WordSpec {
           new String(store content 2) shouldBe "23"
           intercept[ContentTooLargeException](store content 1)
 
-          store delete()
+          store.delete()
           store.exists shouldBe false
           intercept[IOException](store.content)
 
@@ -81,7 +81,7 @@ class ContentSpec extends WordSpec {
           new String(store content 1) shouldBe "3"
           intercept[ContentTooLargeException](store content 0)
 
-          store delete()
+          store.delete()
           store.exists shouldBe false
           intercept[IOException](store.content)
 
@@ -90,7 +90,7 @@ class ContentSpec extends WordSpec {
           new String(store content 0) shouldBe ""
           intercept[IllegalArgumentException](store content -1)
 
-          store delete()
+          store.delete()
           store.exists shouldBe false
           intercept[IOException](store.content)
         }
diff --git a/it/src/test/scala/global/namespace/fun/io/it/DiffAndPatchSpecSuite.scala b/it/src/test/scala/global/namespace/fun/io/it/DiffAndPatchSpecSuite.scala
index d197762..5e89e03 100644
--- a/it/src/test/scala/global/namespace/fun/io/it/DiffAndPatchSpecSuite.scala
+++ b/it/src/test/scala/global/namespace/fun/io/it/DiffAndPatchSpecSuite.scala
@@ -1,6 +1,17 @@
 /*
- * Copyright (C) 2013-2018 Schlichtherle IT Services.
- * All rights reserved. Use is subject to license terms.
+ * Copyright © 2017 - 2019 Schlichtherle IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package global.namespace.fun.io.it
 
@@ -13,7 +24,7 @@ import global.namespace.fun.io.it.DiffAndPatchSpecSuite._
 import org.scalatest.Matchers._
 import org.scalatest.WordSpec
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 
 /** @author Christian Schlichtherle */
 abstract class DiffAndPatchSpecSuite extends WordSpec with ArchiveSpecContext {
diff --git a/it/src/test/scala/global/namespace/fun/io/it/FilterCompositionSpec.scala b/it/src/test/scala/global/namespace/fun/io/it/FilterCompositionSpec.scala
index 5dd04fb..2b6988b 100644
--- a/it/src/test/scala/global/namespace/fun/io/it/FilterCompositionSpec.scala
+++ b/it/src/test/scala/global/namespace/fun/io/it/FilterCompositionSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017 Schlichtherle IT Services
+ * Copyright © 2017 - 2019 Schlichtherle IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ import global.namespace.fun.io.it.FilterCompositionSpec._
 import global.namespace.fun.io.scala.api._
 import org.scalatest.Matchers.{a => _, _}
 import org.scalatest.WordSpec
-import org.scalatest.prop.PropertyChecks._
+import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks._
 
 import scala.io.Source
 
diff --git a/it/src/test/scala/global/namespace/fun/io/it/TransformedCodecSpec.scala b/it/src/test/scala/global/namespace/fun/io/it/TransformedCodecSpec.scala
index 207ec89..de3fd60 100644
--- a/it/src/test/scala/global/namespace/fun/io/it/TransformedCodecSpec.scala
+++ b/it/src/test/scala/global/namespace/fun/io/it/TransformedCodecSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017 Schlichtherle IT Services
+ * Copyright © 2017 - 2019 Schlichtherle IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ import global.namespace.fun.io.zstd.Zstd._
 import javax.xml.bind.JAXBContext
 import org.scalatest.Matchers._
 import org.scalatest.WordSpec
-import org.scalatest.prop.PropertyChecks._
+import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks._
 
 import scala.language.existentials
 
@@ -139,13 +139,13 @@ class TransformedCodecSpec extends WordSpec {
   }
 
   private def assertThatStoreIsEmpty(store: Store): Unit = {
-    store.size should not be 'present
+    store.size should not be Symbol("present")
     store.exists shouldBe false
     intercept[Exception](store.acceptReader((_: InputStream) => ()))
   }
 
   private def assertThatStoreIsNotEmpty(store: Store): Unit = {
-    store.size shouldBe 'present
+    store.size shouldBe Symbol("present")
     store.exists shouldBe true
     store.acceptReader((_: InputStream) => ())
   }
@@ -160,7 +160,7 @@ class TransformedCodecSpec extends WordSpec {
         assertThatStoreIsEmpty(store)
         assertCloneableUsing((transformedCodec << store).clone)
         assertThatStoreIsNotEmpty(store)
-        store delete ()
+        store.delete()
         assertThatStoreIsEmpty(store)
       }
     }
diff --git a/it/src/test/scala/global/namespace/fun/io/it/aws/sdk2/S3SpecContext.scala b/it/src/test/scala/global/namespace/fun/io/it/aws/sdk2/S3SpecContext.scala
index 4c58cb5..5b1269e 100644
--- a/it/src/test/scala/global/namespace/fun/io/it/aws/sdk2/S3SpecContext.scala
+++ b/it/src/test/scala/global/namespace/fun/io/it/aws/sdk2/S3SpecContext.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017 Schlichtherle IT Services
+ * Copyright © 2017 - 2019 Schlichtherle IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +24,7 @@ import org.scalatest.{Canceled, Outcome, TestSuite, TestSuiteMixin}
 import software.amazon.awssdk.services.s3.S3Client
 import software.amazon.awssdk.services.s3.model.ObjectIdentifier
 
-import scala.collection.JavaConverters._
+import scala.jdk.CollectionConverters._
 import scala.util.control.NonFatal
 
 trait S3SpecContext extends TestSuiteMixin {
diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
index 45366e5..1ef2829 100644
--- a/project/BuildSettings.scala
+++ b/project/BuildSettings.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017 Schlichtherle IT Services
+ * Copyright © 2017 - 2019 Schlichtherle IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,14 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 import Dependencies._
 import sbt.Keys._
 import sbt._
 import sbtrelease.ReleasePlugin.autoImport._
 import sbtrelease.ReleaseStateTransformations._
 
-/** @author Christian Schlichtherle */
 object BuildSettings {
 
   def releaseSettings: Seq[Setting[_]] = {
@@ -80,7 +78,7 @@ object BuildSettings {
           }
         )
       },
-      scalaVersion := ScalaVersion_2_12, // set here or otherwise `+publishSigned` will fail
+      scalaVersion := ScalaVersion_2_13, // set here or otherwise `+publishSigned` will fail
       scmInfo := Some(ScmInfo(
         browseUrl = url("https://github.com/christian-schlichtherle/fun-io"),
         connection = "scm:git:git@github.com:christian-schlichtherle/fun-io.git",
@@ -105,7 +103,7 @@ object BuildSettings {
 
   def librarySettings: Seq[Setting[_]] = {
     artifactSettings ++ Seq(
-      // Support testing Java projects with Scalatest et al:
+      // Support testing Java projects with ScalaTest et al:
       compileOrder := CompileOrder.JavaThenScala,
       javacOptions := DefaultOptions.javac ++ Seq(Opts.compile.deprecation, "-Xlint", "-source", "1.8", "-target", "1.8", "-g"),
       javacOptions in doc := DefaultOptions.javac ++ Seq("-source", "1.8"),
@@ -122,7 +120,7 @@ object BuildSettings {
 
   def scalaLibrarySettings: Seq[Setting[_]] = {
     librarySettings ++ Seq(
-      crossScalaVersions := Seq(ScalaVersion_2_10, ScalaVersion_2_11, ScalaVersion_2_12)
+      crossScalaVersions := Seq(ScalaVersion_2_10, ScalaVersion_2_11, ScalaVersion_2_12, ScalaVersion_2_13)
     )
   }
 }
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 19ab1d1..ec1a6ff 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017 Schlichtherle IT Services
+ * Copyright © 2017 - 2019 Schlichtherle IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,20 +19,21 @@ object Dependencies {
 
   private val JAXB_Version = "2.3.1"
 
-  val AwsJavaSdkS3: ModuleID = "com.amazonaws" % "aws-java-sdk-s3" % "1.11.493"
+  val AwsJavaSdkS3: ModuleID = "com.amazonaws" % "aws-java-sdk-s3" % "1.11.570"
   val CommonsCompress: ModuleID = "org.apache.commons" % "commons-compress" % "1.18"
-  val JacksonDatabind: ModuleID = "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.8"
+  val JacksonDatabind: ModuleID = "com.fasterxml.jackson.core" % "jackson-databind" % "2.9.9"
   val JaxbApi: ModuleID = "javax.xml.bind" % "jaxb-api" % JAXB_Version
   val JaxbRuntime: ModuleID = "org.glassfish.jaxb" % "jaxb-runtime" % JAXB_Version
-  val MockitoCore: ModuleID = "org.mockito" % "mockito-core" % "2.24.0"
-  val S3: ModuleID = "software.amazon.awssdk" % "s3" % "2.4.2"
+  val MockitoCore: ModuleID = "org.mockito" % "mockito-core" % "2.28.2"
+  val S3: ModuleID = "software.amazon.awssdk" % "s3" % "2.5.61"
   val Scalacheck: ModuleID = "org.scalacheck" %% "scalacheck" % "1.14.0"
-  val Scalatest: ModuleID = "org.scalatest" %% "scalatest" % "3.0.5"
-  val Slf4jSimple: ModuleID = "org.slf4j" % "slf4j-simple" % "1.7.25"
+  val Scalatest: ModuleID = "org.scalatest" %% "scalatest" % "3.0.8"
+  val Slf4jSimple: ModuleID = "org.slf4j" % "slf4j-simple" % "1.7.26"
   val Xz: ModuleID = "org.tukaani" % "xz" % "1.8"
-  val ZstdJni: ModuleID = "com.github.luben" % "zstd-jni" % "1.3.8-3"
+  val ZstdJni: ModuleID = "com.github.luben" % "zstd-jni" % "1.4.0-1"
 
   val ScalaVersion_2_10: String = sys.env.getOrElse("SCALA_VERSION_2_10", "2.10.7")
   val ScalaVersion_2_11: String = sys.env.getOrElse("SCALA_VERSION_2_11", "2.11.12")
   val ScalaVersion_2_12: String = sys.env.getOrElse("SCALA_VERSION_2_12", "2.12.8")
+  val ScalaVersion_2_13: String = sys.env.getOrElse("SCALA_VERSION_2_13", "2.13.0")
 }
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 9f04fed..af99384 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017 Schlichtherle IT Services
+ * Copyright © 2017 - 2019 Schlichtherle IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,4 +13,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.10")
+
+addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.11")
diff --git a/scala-api/src/main/scala-2.13/global/namespace/fun/io/scala/api/package.scala b/scala-api/src/main/scala-2.13/global/namespace/fun/io/scala/api/package.scala
new file mode 100644
index 0000000..29bcb9a
--- /dev/null
+++ b/scala-api/src/main/scala-2.13/global/namespace/fun/io/scala/api/package.scala
@@ -0,0 +1,19 @@
+/*
+ * Copyright © 2017 - 2019 Schlichtherle IT Services
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package global.namespace.fun.io.scala
+
+/** @author Christian Schlichtherle */
+package object api extends Operators
diff --git a/spi/src/test/scala/global/namespace/fun/io/spi/ArchiveEntryNamesSpec.scala b/spi/src/test/scala/global/namespace/fun/io/spi/ArchiveEntryNamesSpec.scala
index 30bbf57..39e8314 100644
--- a/spi/src/test/scala/global/namespace/fun/io/spi/ArchiveEntryNamesSpec.scala
+++ b/spi/src/test/scala/global/namespace/fun/io/spi/ArchiveEntryNamesSpec.scala
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017 Schlichtherle IT Services
+ * Copyright © 2017 - 2019 Schlichtherle IT Services
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
  */
 package global.namespace.fun.io.spi
 
-import ArchiveEntryNames.requireInternal
+import global.namespace.fun.io.spi.ArchiveEntryNames.requireInternal
 import org.scalatest.Matchers._
 import org.scalatest.WordSpec
-import org.scalatest.prop.PropertyChecks._
+import org.scalatestplus.scalacheck.ScalaCheckPropertyChecks._
 
 class ArchiveEntryNamesSpec extends WordSpec {
 
diff --git a/version.sbt b/version.sbt
index c670469..4ce70f5 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "2.0.1-SNAPSHOT"
+version in ThisBuild := "2.1.0-SNAPSHOT"