diff --git a/spring-data-riak/pom.xml b/spring-data-riak/pom.xml
index 96261dc0c..120963fd0 100644
--- a/spring-data-riak/pom.xml
+++ b/spring-data-riak/pom.xml
@@ -130,6 +130,45 @@
         <groupId>org.spockframework</groupId>
         <artifactId>spock-maven</artifactId>
       </plugin>
+      <!-- For running Groovy/Spock tests -->
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <configuration>
+          <tasks>
+            <taskdef name="groovyc" classname="org.codehaus.groovy.ant.Groovyc"/>
+            <groovyc srcdir="src/test/groovy"
+                     destdir="${project.build.testOutputDirectory}"
+                     listfiles="yes"
+                     classpathref="maven.test.classpath"/>
+          </tasks>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-all</artifactId>
+            <version>1.7.5</version>
+          </dependency>
+          <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm</artifactId>
+            <version>3.2</version>
+          </dependency>
+          <dependency>
+            <groupId>antlr</groupId>
+            <artifactId>antlr</artifactId>
+            <version>2.7.7</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+
     </plugins>
   </build>
 
diff --git a/spring-data-riak/src/test/java/org/springframework/data/riak/core/TestObject.java b/spring-data-riak/src/test/java/org/springframework/data/riak/core/TestObject.java
new file mode 100644
index 000000000..fb37ae547
--- /dev/null
+++ b/spring-data-riak/src/test/java/org/springframework/data/riak/core/TestObject.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2010 by J. Brisbin <jon@jbrisbin.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.riak.core;
+
+/**
+ * @author J. Brisbin <jon@jbrisbin.com>
+ */
+public class TestObject {
+  String test = "value";
+  Integer integer = 12;
+
+  public String getTest() {
+    return test;
+  }
+
+  public void setTest(String test) {
+    this.test = test;
+  }
+
+  public Integer getInteger() {
+    return integer;
+  }
+
+  public void setInteger(Integer integer) {
+    this.integer = integer;
+  }
+}
diff --git a/spring-data-riak/template.mf b/spring-data-riak/template.mf
index 5d4d14cf3..aba21f9d8 100644
--- a/spring-data-riak/template.mf
+++ b/spring-data-riak/template.mf
@@ -24,3 +24,5 @@ Import-Template:
  org.codehaus.jackson.*;version="[1.5.6, 1.5.6)",
  org.codehaus.jackson.map.*;version="[1.5.6, 1.5.6)",
  org.codehaus.groovy.runtime.*;version="[1.7.5, 2.0.0)",
+ javax.activation.*;version="[1.1, 2.0)",
+ javax.mail.*;version="[1.4.0, 2.0.0)",
\ No newline at end of file