diff --git a/scm-core/pom.xml b/scm-core/pom.xml
index 7d78979d96..a03c1bb72a 100644
--- a/scm-core/pom.xml
+++ b/scm-core/pom.xml
@@ -34,7 +34,6 @@
     <version>2.0.0-SNAPSHOT</version>
   </parent>
 
-  <groupId>sonia.scm</groupId>
   <artifactId>scm-core</artifactId>
   <version>2.0.0-SNAPSHOT</version>
   <name>scm-core</name>
diff --git a/scm-dao-xml/pom.xml b/scm-dao-xml/pom.xml
index 42f49dd8f3..bfb331ede5 100644
--- a/scm-dao-xml/pom.xml
+++ b/scm-dao-xml/pom.xml
@@ -34,7 +34,6 @@
     <version>2.0.0-SNAPSHOT</version>
   </parent>
   
-  <groupId>sonia.scm</groupId>
   <artifactId>scm-dao-xml</artifactId>
   <version>2.0.0-SNAPSHOT</version>
   <name>scm-dao-xml</name>
diff --git a/scm-dao-xml/src/test/java/sonia/scm/store/TypedStoreContextTest.java b/scm-dao-xml/src/test/java/sonia/scm/store/TypedStoreContextTest.java
index d29fd44298..66a390d2ae 100644
--- a/scm-dao-xml/src/test/java/sonia/scm/store/TypedStoreContextTest.java
+++ b/scm-dao-xml/src/test/java/sonia/scm/store/TypedStoreContextTest.java
@@ -26,7 +26,7 @@ package sonia.scm.store;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junitpioneer.jupiter.TempDirectory;
+import org.junit.jupiter.api.io.TempDir;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -46,11 +46,11 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-@ExtendWith({MockitoExtension.class, TempDirectory.class})
+@ExtendWith(MockitoExtension.class)
 class TypedStoreContextTest {
 
   @Test
-  void shouldMarshallAndUnmarshall(@TempDirectory.TempDir Path tempDir) {
+  void shouldMarshallAndUnmarshall(@TempDir Path tempDir) {
     TypedStoreContext<Sample> context = context(Sample.class);
 
     File file = tempDir.resolve("test.xml").toFile();
@@ -61,7 +61,7 @@ class TypedStoreContextTest {
   }
 
   @Test
-  void shouldWorkWithMarshallerAndUnmarshaller(@TempDirectory.TempDir Path tempDir) {
+  void shouldWorkWithMarshallerAndUnmarshaller(@TempDir Path tempDir) {
     TypedStoreContext<Sample> context = context(Sample.class);
 
     File file = tempDir.resolve("test.xml").toFile();
@@ -101,7 +101,7 @@ class TypedStoreContextTest {
   }
 
   @Test
-  void shouldConfigureAdapter(@TempDirectory.TempDir Path tempDir) {
+  void shouldConfigureAdapter(@TempDir Path tempDir) {
     TypedStoreParameters<SampleWithAdapter> params = params(SampleWithAdapter.class);
     when(params.getAdapters()).thenReturn(Collections.singleton(new AppendingAdapter("!")));