diff --git a/pom.xml b/pom.xml
index 3c97ae6..57023cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,6 +62,7 @@
     <basepom.oss.skip-scala-doc>true</basepom.oss.skip-scala-doc>
     <basepom.check.skip-javadoc>false</basepom.check.skip-javadoc>
     <basepom.check.fail-javadoc>false</basepom.check.fail-javadoc>
+    <moduleName>com.opentable.components.otj.pg.embedded</moduleName>
   </properties>
 
   <licenses>
@@ -160,6 +161,39 @@
     </dependencies>
   </dependencyManagement>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>default-jar</id>
+            <!-- add module name to main artifact -->
+            <configuration>
+              <archive>
+                <manifestEntries combine.children="append">
+                  <Automatic-Module-Name>${moduleName}</Automatic-Module-Name>
+                </manifestEntries>
+              </archive>
+            </configuration>
+          </execution>
+          <execution>
+            <id>basepom.default</id>
+            <!-- add module name with "test" appended to tests artifact -->
+            <configuration>
+              <archive>
+                <manifestEntries combine.children="append">
+                  <Automatic-Module-Name>${moduleName}.tests</Automatic-Module-Name>
+                </manifestEntries>
+              </archive>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
   <profiles>
     <profile>
       <id>oss-build</id>
@@ -337,5 +371,4 @@
       </build>
     </profile>
   </profiles>
-
 </project>