diff --git a/maven-core-it/README.txt b/maven-core-it/README.txt
index 3d088e5c12..802b76af74 100644
--- a/maven-core-it/README.txt
+++ b/maven-core-it/README.txt
@@ -171,6 +171,10 @@ it0060: Test aggregation of list configuration items when using
         'combine.children=append' attribute. Specifically, merge the list of
         excludes for the testCompile mojo.
 
+it0061: Verify that deployment of artifacts to a legacy-layout repository
+        results in a groupId directory of 'the.full.group.id' instead of
+        'the/full/group/id'.
+
 -------------------------------------------------------------------------------
 
 - generated sources
diff --git a/maven-core-it/integration-tests.txt b/maven-core-it/integration-tests.txt
index 198f8d6b65..8a8ab90412 100644
--- a/maven-core-it/integration-tests.txt
+++ b/maven-core-it/integration-tests.txt
@@ -1,3 +1,4 @@
+it0061
 it0060
 it0059
 it0058
diff --git a/maven-core-it/it0061/expected-results.txt b/maven-core-it/it0061/expected-results.txt
new file mode 100644
index 0000000000..bf351fe37e
--- /dev/null
+++ b/maven-core-it/it0061/expected-results.txt
@@ -0,0 +1,2 @@
+target/test-repo/org.apache.maven.it/jars/maven-core-it0061-1.0.jar
+target/test-repo/org.apache.maven.it/poms/maven-core-it0061-1.0.pom
diff --git a/maven-core-it/it0061/goals.txt b/maven-core-it/it0061/goals.txt
new file mode 100644
index 0000000000..8541464a78
--- /dev/null
+++ b/maven-core-it/it0061/goals.txt
@@ -0,0 +1 @@
+deploy
diff --git a/maven-core-it/it0061/pom.xml b/maven-core-it/it0061/pom.xml
new file mode 100644
index 0000000000..448e15add4
--- /dev/null
+++ b/maven-core-it/it0061/pom.xml
@@ -0,0 +1,25 @@
+<model>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.maven.it</groupId>
+  <artifactId>maven-core-it0061</artifactId>
+  <packaging>jar</packaging>
+  <version>1.0</version>
+
+  <distributionManagement>
+    <repository>
+      <id>test</id>
+      <url>file:target/test-repo</url>
+      <layout>legacy</layout>
+    </repository>
+  </distributionManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <type>jar</type>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</model>
diff --git a/maven-core-it/it0061/src/main/java/org/apache/maven/it0001/Person.java b/maven-core-it/it0061/src/main/java/org/apache/maven/it0001/Person.java
new file mode 100644
index 0000000000..613e499ae0
--- /dev/null
+++ b/maven-core-it/it0061/src/main/java/org/apache/maven/it0001/Person.java
@@ -0,0 +1,16 @@
+package org.apache.maven.it0001;
+
+public class Person
+{
+    private String name;
+    
+    public void setName( String name )
+    {
+        this.name = name;
+    }
+    
+    public String getName()
+    {
+        return name;
+    }
+}
diff --git a/maven-core-it/it0061/src/main/resources/it0001.properties b/maven-core-it/it0061/src/main/resources/it0001.properties
new file mode 100644
index 0000000000..f54f8ab106
--- /dev/null
+++ b/maven-core-it/it0061/src/main/resources/it0001.properties
@@ -0,0 +1 @@
+name = jason