diff --git a/Sanity/smoke/build.xml b/Sanity/build-java-project/build.xml
similarity index 100%
rename from Sanity/smoke/build.xml
rename to Sanity/build-java-project/build.xml
diff --git a/Sanity/build-java-project/main.fmf b/Sanity/build-java-project/main.fmf
new file mode 100644
index 0000000..2383f5d
--- /dev/null
+++ b/Sanity/build-java-project/main.fmf
@@ -0,0 +1,8 @@
+summary: Ant Java project test
+description: |
+  Build and test a simple Java project with Ant.
+require+:
+  - ant-junit
+tag-:
+  - jre8
+  - unbound
diff --git a/Sanity/build-java-project/runtest.sh b/Sanity/build-java-project/runtest.sh
new file mode 100755
index 0000000..93c8b6f
--- /dev/null
+++ b/Sanity/build-java-project/runtest.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+# Author: Mikolaj Izdebski <mizdebsk@redhat.com>
+. /usr/share/beakerlib/beakerlib.sh
+
+rlJournalStart
+
+  rlPhaseStartTest "check for presence of ant command"
+    rlAssertRpm ant
+    rlAssertBinaryOrigin ant ant
+  rlPhaseEnd
+
+  rlPhaseStartTest "build simple project"
+    rlAssertRpm ant-junit
+    rm -rf build
+    rlRun -s "ant -v clean"
+    rlAssertNotExists build
+    rlRun -s "ant -v test"
+    rlAssertGrep "Running tt.MyTest" $rlRun_LOG
+    rlAssertGrep "Tests run: 1, Failures: 0, Errors: 0, Skipped: 0" $rlRun_LOG
+    rlAssertGrep "BUILD SUCCESSFUL" $rlRun_LOG
+    rlAssertExists build/main/tt/My.class
+    rlAssertExists build/test/tt/MyTest.class
+    if [ "${OPENJDK_HEADLESS}" != "true" ]; then
+      rlRun -s "ant -v javadoc"
+      rlAssertExists build/javadoc/index.html
+      rlAssertExists build/javadoc/tt/My.html
+    fi
+    rlRun -s "ant -v run -Darg1=42 -Darg2=59"
+    rlAssertGrep "RESULT is 101" $rlRun_LOG
+    rlAssertGrep "BUILD SUCCESSFUL" $rlRun_LOG
+    rlRun -s "ant -v run-nofork -Darg1=42 -Darg2=60"
+    rlAssertGrep "RESULT is 102" $rlRun_LOG
+    rlAssertGrep "BUILD SUCCESSFUL" $rlRun_LOG
+    rlRun -s "ant -v clean"
+    rlAssertNotExists build
+  rlPhaseEnd
+
+rlJournalEnd
+rlJournalPrintText
diff --git a/Sanity/smoke/src/main/java/tt/My.java b/Sanity/build-java-project/src/main/java/tt/My.java
similarity index 100%
rename from Sanity/smoke/src/main/java/tt/My.java
rename to Sanity/build-java-project/src/main/java/tt/My.java
diff --git a/Sanity/smoke/src/test/java/tt/MyTest.java b/Sanity/build-java-project/src/test/java/tt/MyTest.java
similarity index 100%
rename from Sanity/smoke/src/test/java/tt/MyTest.java
rename to Sanity/build-java-project/src/test/java/tt/MyTest.java
diff --git a/Sanity/smoke/main.fmf b/Sanity/smoke/main.fmf
index 4db1411..2b9cc18 100644
--- a/Sanity/smoke/main.fmf
+++ b/Sanity/smoke/main.fmf
@@ -1,8 +1,3 @@
 summary: Ant smoke test
 description: |
   Test basic functionality of Ant.
-require+:
-  - ant-junit
-tag-:
-  - jre8
-  - unbound
diff --git a/Sanity/smoke/runtest.sh b/Sanity/smoke/runtest.sh
index e3f10b1..c45e7ac 100755
--- a/Sanity/smoke/runtest.sh
+++ b/Sanity/smoke/runtest.sh
@@ -30,31 +30,5 @@ rlJournalStart
     rlAssertGrep "BUILD SUCCESSFUL" $rlRun_LOG
   rlPhaseEnd
 
-  rlPhaseStartTest "build simple project"
-    rlAssertRpm ant-junit
-    rm -rf build
-    rlRun -s "ant -v clean"
-    rlAssertNotExists build
-    rlRun -s "ant -v test"
-    rlAssertGrep "Running tt.MyTest" $rlRun_LOG
-    rlAssertGrep "Tests run: 1, Failures: 0, Errors: 0, Skipped: 0" $rlRun_LOG
-    rlAssertGrep "BUILD SUCCESSFUL" $rlRun_LOG
-    rlAssertExists build/main/tt/My.class
-    rlAssertExists build/test/tt/MyTest.class
-    if [ "${OPENJDK_HEADLESS}" != "true" ]; then
-      rlRun -s "ant -v javadoc"
-      rlAssertExists build/javadoc/index.html
-      rlAssertExists build/javadoc/tt/My.html
-    fi
-    rlRun -s "ant -v run -Darg1=42 -Darg2=59"
-    rlAssertGrep "RESULT is 101" $rlRun_LOG
-    rlAssertGrep "BUILD SUCCESSFUL" $rlRun_LOG
-    rlRun -s "ant -v run-nofork -Darg1=42 -Darg2=60"
-    rlAssertGrep "RESULT is 102" $rlRun_LOG
-    rlAssertGrep "BUILD SUCCESSFUL" $rlRun_LOG
-    rlRun -s "ant -v clean"
-    rlAssertNotExists build
-  rlPhaseEnd
-
 rlJournalEnd
 rlJournalPrintText