diff --git a/src/test/java/org/codehaus/mojo/versions/SetMojoTest.java b/src/test/java/org/codehaus/mojo/versions/SetMojoTest.java
index fb674768a8..77944d34b0 100644
--- a/src/test/java/org/codehaus/mojo/versions/SetMojoTest.java
+++ b/src/test/java/org/codehaus/mojo/versions/SetMojoTest.java
@@ -95,7 +95,8 @@ public void testNextSnapshotIndexWithoutNextSnapshot() throws MojoFailureExcepti
     @Test
     public void testVersionlessDependency() throws Exception
     {
-        SetMojo myMojo = createMojo( "set", "src/test/resources/org/codehaus/mojo/set/versionless-01/pom.xml" );
+        SetMojo myMojo =
+                (SetMojo) createMojo( "set", "src/test/resources/org/codehaus/mojo/set/versionless-01/pom.xml" );
         myMojo.execute();
     }
 }
diff --git a/src/test/java/org/codehaus/mojo/versions/utils/BaseMojoTestCase.java b/src/test/java/org/codehaus/mojo/versions/utils/BaseMojoTestCase.java
index 5900ff12c0..56c21be4d6 100644
--- a/src/test/java/org/codehaus/mojo/versions/utils/BaseMojoTestCase.java
+++ b/src/test/java/org/codehaus/mojo/versions/utils/BaseMojoTestCase.java
@@ -7,9 +7,9 @@
 import org.apache.maven.model.Build;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.apache.maven.plugin.Mojo;
 import org.apache.maven.plugin.testing.AbstractMojoTestCase;
 import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
-import org.codehaus.mojo.versions.SetMojo;
 import org.codehaus.plexus.util.ReaderFactory;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
 
@@ -58,11 +58,11 @@ public abstract class BaseMojoTestCase extends AbstractMojoTestCase
      * @return a Mojo instance
      * @throws Exception thrown if mojo lookup fails
      */
-    protected SetMojo createMojo( String goal, String pomFilePath ) throws Exception
+    protected Mojo createMojo( String goal, String pomFilePath ) throws Exception
     {
         File pomFile = new File( pomFilePath );
-        SetMojo mojo = (SetMojo) lookupMojo( goal, pomFile );
-        mojo.setProject( new TestProjectStub( pomFile ) );
+        Mojo mojo = lookupMojo( goal, pomFile );
+        setVariableValueToObject( mojo, "project", new TestProjectStub( pomFile ) );
         return mojo;
     }