diff --git a/src/main/java/net/sourceforge/jFuzzyLogic/testCases/TestCaseCommandLine.java b/src/test/java/net/sourceforge/jFuzzyLogic/TestCaseCommandLine.java
similarity index 78%
rename from src/main/java/net/sourceforge/jFuzzyLogic/testCases/TestCaseCommandLine.java
rename to src/test/java/net/sourceforge/jFuzzyLogic/TestCaseCommandLine.java
index 6000015..1eedc6f 100644
--- a/src/main/java/net/sourceforge/jFuzzyLogic/testCases/TestCaseCommandLine.java
+++ b/src/test/java/net/sourceforge/jFuzzyLogic/TestCaseCommandLine.java
@@ -1,13 +1,11 @@
-package net.sourceforge.jFuzzyLogic.testCases;
+package net.sourceforge.jFuzzyLogic;
 
 import junit.framework.TestCase;
-import net.sourceforge.jFuzzyLogic.FIS;
-import net.sourceforge.jFuzzyLogic.Gpr;
-import net.sourceforge.jFuzzyLogic.JFuzzyLogic;
-
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
+@Ignore
 public class TestCaseCommandLine extends TestCase {
 
 	public static final double EPSILON = 1e-6;
diff --git a/src/main/java/net/sourceforge/jFuzzyLogic/testCases/TestCaseJfuzzy.java b/src/test/java/net/sourceforge/jFuzzyLogic/TestCaseJfuzzy.java
similarity index 98%
rename from src/main/java/net/sourceforge/jFuzzyLogic/testCases/TestCaseJfuzzy.java
rename to src/test/java/net/sourceforge/jFuzzyLogic/TestCaseJfuzzy.java
index 1626dfd..9b5bdc1 100644
--- a/src/main/java/net/sourceforge/jFuzzyLogic/testCases/TestCaseJfuzzy.java
+++ b/src/test/java/net/sourceforge/jFuzzyLogic/TestCaseJfuzzy.java
@@ -5,27 +5,26 @@
  *
  * @author pcingola@users.sourceforge.net
  */
-package net.sourceforge.jFuzzyLogic.testCases;
-
-import java.util.List;
+package net.sourceforge.jFuzzyLogic;
 
 import junit.framework.TestCase;
-import net.sourceforge.jFuzzyLogic.FIS;
-import net.sourceforge.jFuzzyLogic.FunctionBlock;
-import net.sourceforge.jFuzzyLogic.Gpr;
 import net.sourceforge.jFuzzyLogic.rule.Rule;
 import net.sourceforge.jFuzzyLogic.rule.RuleBlock;
 import net.sourceforge.jFuzzyLogic.rule.Variable;
-
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
+import java.util.List;
+
 /**
  * Main testing class
  *
  * @author pcingola@users.sourceforge.net
  *
  */
+
+@Ignore
 public class TestCaseJfuzzy extends TestCase {
 
 	static double EPSILON = 0.000001; // A small number
diff --git a/src/main/java/net/sourceforge/jFuzzyLogic/testCases/TestCaseTipper.java b/src/test/java/net/sourceforge/jFuzzyLogic/TestCaseTipper.java
similarity index 97%
rename from src/main/java/net/sourceforge/jFuzzyLogic/testCases/TestCaseTipper.java
rename to src/test/java/net/sourceforge/jFuzzyLogic/TestCaseTipper.java
index c19606c..30708da 100644
--- a/src/main/java/net/sourceforge/jFuzzyLogic/testCases/TestCaseTipper.java
+++ b/src/test/java/net/sourceforge/jFuzzyLogic/TestCaseTipper.java
@@ -1,14 +1,12 @@
-package net.sourceforge.jFuzzyLogic.testCases;
+package net.sourceforge.jFuzzyLogic;
 
 import junit.framework.TestCase;
-import net.sourceforge.jFuzzyLogic.FIS;
-import net.sourceforge.jFuzzyLogic.FunctionBlock;
-import net.sourceforge.jFuzzyLogic.Gpr;
-
 import org.antlr.runtime.RecognitionException;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
+@Ignore
 public class TestCaseTipper extends TestCase {
 
 	public static final double EPSILON = 0.001; // Error tolerated
diff --git a/src/main/java/net/sourceforge/jFuzzyLogic/testCases/TestCaseZzz.java b/src/test/java/net/sourceforge/jFuzzyLogic/TestCaseZzz.java
similarity index 95%
rename from src/main/java/net/sourceforge/jFuzzyLogic/testCases/TestCaseZzz.java
rename to src/test/java/net/sourceforge/jFuzzyLogic/TestCaseZzz.java
index 37021c8..1565f17 100644
--- a/src/main/java/net/sourceforge/jFuzzyLogic/testCases/TestCaseZzz.java
+++ b/src/test/java/net/sourceforge/jFuzzyLogic/TestCaseZzz.java
@@ -5,14 +5,12 @@
  *
  * @author pcingola@users.sourceforge.net
  */
-package net.sourceforge.jFuzzyLogic.testCases;
+package net.sourceforge.jFuzzyLogic;
 
 import junit.framework.TestCase;
-import net.sourceforge.jFuzzyLogic.FIS;
-import net.sourceforge.jFuzzyLogic.Gpr;
 import net.sourceforge.jFuzzyLogic.rule.Variable;
-
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -21,6 +19,8 @@ import org.junit.Test;
  * @author pcingola@users.sourceforge.net
  *
  */
+
+@Ignore
 public class TestCaseZzz extends TestCase {
 
 	static double EPSILON = 0.000001; // A small number
diff --git a/src/main/java/net/sourceforge/jFuzzyLogic/testCases/TestSuiteAll.java b/src/test/java/net/sourceforge/jFuzzyLogic/TestSuiteAll.java
similarity index 64%
rename from src/main/java/net/sourceforge/jFuzzyLogic/testCases/TestSuiteAll.java
rename to src/test/java/net/sourceforge/jFuzzyLogic/TestSuiteAll.java
index b49de55..8852f35 100644
--- a/src/main/java/net/sourceforge/jFuzzyLogic/testCases/TestSuiteAll.java
+++ b/src/test/java/net/sourceforge/jFuzzyLogic/TestSuiteAll.java
@@ -1,11 +1,10 @@
-package net.sourceforge.jFuzzyLogic.testCases;
+package net.sourceforge.jFuzzyLogic;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
-import net.sourceforge.jFuzzyLogic.testCases.TestCaseCommandLine;
-import net.sourceforge.jFuzzyLogic.testCases.TestCaseJfuzzy;
-import net.sourceforge.jFuzzyLogic.testCases.TestCaseTipper;
+import org.junit.Ignore;
 
+@Ignore
 public class TestSuiteAll {
 
 	public static void main(String args[]) {