diff --git a/marvel/pom.xml b/marvel/pom.xml
index ab0785168ae..ce6514867ad 100644
--- a/marvel/pom.xml
+++ b/marvel/pom.xml
@@ -7,10 +7,10 @@
 
     <groupId>org.elasticsearch</groupId>
     <artifactId>elasticsearch-marvel</artifactId>
-    <name>Elastic X-Plugins - Marvel</name>
+    <name>Elasticsearch X-Plugins - Marvel</name>
 
     <parent>
-        <groupId>org.elasticsearch</groupId>
+        <groupId>org.elasticsearch.plugin</groupId>
         <artifactId>x-plugins</artifactId>
         <version>2.0.0-beta1-SNAPSHOT</version>
     </parent>
diff --git a/marvel/src/main/java/org/elasticsearch/marvel/MarvelVersion.java b/marvel/src/main/java/org/elasticsearch/marvel/MarvelVersion.java
index f156e93c424..99ac77bea2f 100644
--- a/marvel/src/main/java/org/elasticsearch/marvel/MarvelVersion.java
+++ b/marvel/src/main/java/org/elasticsearch/marvel/MarvelVersion.java
@@ -22,7 +22,7 @@ public class MarvelVersion implements Serializable {
     // the (internal) format of the id is there so we can easily do after/before checks on the id
 
     public static final int V_2_0_0_Beta1_ID = /*00*/2000001;
-    public static final MarvelVersion V_2_0_0_Beta1 = new MarvelVersion(V_2_0_0_Beta1_ID, true, Version.V_2_0_0_Beta1, LicenseVersion.V_1_0_0);
+    public static final MarvelVersion V_2_0_0_Beta1 = new MarvelVersion(V_2_0_0_Beta1_ID, true, Version.V_2_0_0_beta1, LicenseVersion.V_1_0_0);
 
     public static final MarvelVersion CURRENT = V_2_0_0_Beta1;
 
diff --git a/marvel/src/test/java/org/elasticsearch/marvel/MarvelPluginTests.java b/marvel/src/test/java/org/elasticsearch/marvel/MarvelPluginTests.java
index 403912d2378..72627e5e104 100644
--- a/marvel/src/test/java/org/elasticsearch/marvel/MarvelPluginTests.java
+++ b/marvel/src/test/java/org/elasticsearch/marvel/MarvelPluginTests.java
@@ -9,6 +9,7 @@ import org.elasticsearch.action.admin.cluster.node.info.NodeInfo;
 import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;
 import org.elasticsearch.action.admin.cluster.node.info.PluginInfo;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.license.plugin.LicensePlugin;
 import org.elasticsearch.marvel.agent.AgentService;
 import org.elasticsearch.plugins.PluginsService;
 import org.elasticsearch.test.ElasticsearchIntegrationTest;
@@ -26,7 +27,7 @@ public class MarvelPluginTests extends ElasticsearchIntegrationTest {
     protected Settings nodeSettings(int nodeOrdinal) {
         return Settings.settingsBuilder()
                 .put(super.nodeSettings(nodeOrdinal))
-                .put("plugin.types", MarvelPlugin.class.getName())
+                .put("plugin.types", MarvelPlugin.class.getName() + "," + LicensePlugin.class.getName())
                 .put(PluginsService.LOAD_PLUGIN_FROM_CLASSPATH, false)
                 .build();
     }
diff --git a/pom.xml b/pom.xml
index 4bbc6aa32de..eb3e142993e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -130,5 +130,6 @@
         <module>license</module>
         <module>shield</module>
         <module>watcher</module>
+        <module>marvel</module>
     </modules>
 </project>