diff --git a/modello-build.tar.xz b/modello-build.tar.xz
index b30cc03..d4794ce 100644
--- a/modello-build.tar.xz
+++ b/modello-build.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:501f2c19edb24f6e21bc00e19d800f94fcc0e047d281b43da14d186c10c7584d
-size 5000
+oid sha256:d2464c5ae4ed8d9e6cf481175c8f16d957e750721a4ccc51652ff890d24962ed
+size 5032
diff --git a/modello.spec b/modello.spec
index 3d14a6c..930f323 100644
--- a/modello.spec
+++ b/modello.spec
@@ -39,9 +39,11 @@ BuildRequires:  jackson-core
 BuildRequires:  javadoc-parser
 BuildRequires:  javapackages-local >= 6
 BuildRequires:  jsoup
+BuildRequires:  junit
 BuildRequires:  objectweb-asm
 BuildRequires:  plexus-build-api
 BuildRequires:  plexus-classworlds
+BuildRequires:  plexus-compiler
 BuildRequires:  plexus-utils
 BuildRequires:  plexus-xml
 BuildRequires:  sisu-inject
@@ -77,6 +79,16 @@ architecture, various types of code and descriptors can be generated
 from the single model, including Java POJOs, XML
 marshallers/unmarshallers, XSD and documentation.
 
+%package test
+Summary:        Modello Test Package
+Group:          Development/Libraries/Java
+Requires:       %{name} = %{version}
+
+%description test
+Modello Test Package contains the basis to create Modello generator
+unit-tests, including sample models and xml files to test every
+feature for every plugin.
+
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Libraries/Java
@@ -112,10 +124,12 @@ build-jar-repository -s lib \
     jackson-core \
     javadoc-parser \
     jsoup \
+    junit \
     org.eclipse.sisu.inject \
     org.eclipse.sisu.plexus \
     plexus/classworlds \
     plexus/cli \
+    plexus-compiler \
     plexus/plexus-build-api \
     plexus/utils \
     plexus/xml \
@@ -135,10 +149,10 @@ install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}
 
-for i in core; do
+for i in core test; do
   install -pm 0644 %{name}-${i}/target/%{name}-${i}-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}-${i}.jar
   %{mvn_install_pom} %{name}-${i}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-${i}.pom
-  %add_maven_depmap %{name}/%{name}-${i}.pom %{name}/%{name}-${i}.jar
+  %add_maven_depmap %{name}/%{name}-${i}.pom %{name}/%{name}-${i}.jar -f ${i}
   install -dm 0755 %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}
   cp -pr %{name}-${i}/target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/%{name}-${i}/
 done
@@ -156,10 +170,13 @@ done
 # script
 %jpackage_script org.codehaus.modello.ModelloCli "" "" modello:objectweb-asm:org.eclipse.sisu.plexus:org.eclipse.sisu.inject:jackson-core:javadoc-parser:google-guice:aopalliance:atinject:plexus-containers/plexus-component-annotations:plexus/classworlds:plexus/utils:plexus/xml:plexus/plexus-build-api:guava:slf4j/api:slf4j/simple:snakeyaml:velocity %{name} true
 
-%files -f .mfiles
+%files -f .mfiles -f .mfiles-core
 %license LICENSE
 %{_bindir}/*
 
+%files test -f .mfiles-test
+%license LICENSE
+
 %files javadoc
 %license LICENSE
 %{_javadocdir}/%{name}