Index: trunk/src/test/java/omq/test/calculator/ServerTest.java
===================================================================
--- trunk/src/test/java/omq/test/calculator/ServerTest.java	(revision 47)
+++ trunk/src/test/java/omq/test/calculator/ServerTest.java	(revision 48)
@@ -3,9 +3,8 @@
 import java.util.Properties;
 
-import org.junit.Test;
-
 import omq.common.broker.Broker;
 import omq.common.util.ParameterQueue;
-import omq.common.util.Serializer;
+
+import org.junit.Test;
 
 public class ServerTest {
@@ -23,6 +22,5 @@
 		env.setProperty(ParameterQueue.SERVER_HOST, "127.0.0.1");
 		env.setProperty(ParameterQueue.SERVER_PORT, "5672");
-		env.setProperty(ParameterQueue.DURABLE_QUEUES, "true");
-		env.setProperty(ParameterQueue.SERIALIZER_NAME, Serializer.java);
+		env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
 		env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
 
Index: trunk/src/test/java/omq/test/faultTolerance/ServerTest.java
===================================================================
--- trunk/src/test/java/omq/test/faultTolerance/ServerTest.java	(revision 47)
+++ trunk/src/test/java/omq/test/faultTolerance/ServerTest.java	(revision 48)
@@ -3,10 +3,9 @@
 import java.util.Properties;
 
-import org.junit.Test;
-
 import omq.common.broker.Broker;
 import omq.common.util.ParameterQueue;
-import omq.common.util.Serializer;
 import omq.test.calculator.CalculatorImpl;
+
+import org.junit.Test;
 
 public class ServerTest {
@@ -23,5 +22,4 @@
 		env.setProperty(ParameterQueue.SERVER_PORT, "5672");
 		env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-		env.setProperty(ParameterQueue.SERIALIZER_NAME, Serializer.java);
 		env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
 
Index: trunk/src/test/java/omq/test/multiProcess/ClientTest.java
===================================================================
--- trunk/src/test/java/omq/test/multiProcess/ClientTest.java	(revision 47)
+++ trunk/src/test/java/omq/test/multiProcess/ClientTest.java	(revision 48)
@@ -3,4 +3,6 @@
 import static org.junit.Assert.assertEquals;
 
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Properties;
 
@@ -9,13 +11,16 @@
 import omq.common.util.Serializer;
 
-import org.junit.BeforeClass;
+import org.junit.After;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameters;
 
+@RunWith(value = Parameterized.class)
 public class ClientTest {
 	// Execute ServerTest.java 2 times before start this test
-	public static Number remoteNumber;
+	public Number remoteNumber;
 
-	@BeforeClass
-	public static void startClient() throws Exception {
+	public ClientTest(String type) throws Exception {
 		Properties env = new Properties();
 		env.setProperty(ParameterQueue.USER_NAME, "guest");
@@ -26,5 +31,5 @@
 		env.setProperty(ParameterQueue.SERVER_PORT, "5672");
 		env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-		env.setProperty(ParameterQueue.SERIALIZER_NAME, Serializer.java);
+		env.setProperty(ParameterQueue.SERIALIZER_NAME, type);
 		env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
 
@@ -41,4 +46,15 @@
 	}
 
+	@Parameters
+	public static Collection<Object[]> data() {
+		Object[][] data = new Object[][] { { Serializer.java }, { Serializer.gson }, { Serializer.kryo } };
+		return Arrays.asList(data);
+	}
+
+	@After
+	public void stop() throws Exception {
+		Broker.stopBroker();
+	}
+
 	@Test
 	public void test() {
@@ -46,7 +62,8 @@
 		remoteNumber.setNumber(x);
 		int a = remoteNumber.getNumer();
-		assertEquals(a, 0);
+		assertEquals(0, a);
 		int b = remoteNumber.getNumer();
 		assertEquals(x, b);
+		remoteNumber.setNumber(0);
 	}
 
Index: trunk/src/test/java/omq/test/multiProcess/ServerTest.java
===================================================================
--- trunk/src/test/java/omq/test/multiProcess/ServerTest.java	(revision 47)
+++ trunk/src/test/java/omq/test/multiProcess/ServerTest.java	(revision 48)
@@ -3,10 +3,12 @@
 import java.util.Properties;
 
+import org.junit.Test;
+
 import omq.common.broker.Broker;
 import omq.common.util.ParameterQueue;
-import omq.common.util.Serializer;
 
 public class ServerTest {
-	public static void main(String[] args) throws Exception {
+	@Test
+	public void test() throws Exception {
 		Properties env = new Properties();
 		env.setProperty(ParameterQueue.USER_NAME, "guest");
@@ -17,5 +19,4 @@
 		env.setProperty(ParameterQueue.SERVER_PORT, "5672");
 		env.setProperty(ParameterQueue.DURABLE_QUEUES, "false");
-		env.setProperty(ParameterQueue.SERIALIZER_NAME, Serializer.java);
 		env.setProperty(ParameterQueue.ENABLECOMPRESSION, "false");
 
@@ -26,4 +27,6 @@
 		Broker.initBroker(env);
 		Broker.bind("number", new NumberImpl());
+
+		Thread.sleep(60 * 1000);
 	}
 }
Index: trunk/src/test/java/omq/test/stopBroker/ServerTest.java
===================================================================
--- trunk/src/test/java/omq/test/stopBroker/ServerTest.java	(revision 47)
+++ trunk/src/test/java/omq/test/stopBroker/ServerTest.java	(revision 48)
@@ -2,4 +2,6 @@
 
 import java.util.Properties;
+
+import org.junit.Test;
 
 import omq.common.broker.Broker;
@@ -9,8 +11,6 @@
 public class ServerTest {
 
-	/**
-	 * @param args
-	 */
-	public static void main(String[] args) throws Exception {
+	@Test
+	public void test() throws Exception {
 		Properties env = new Properties();
 		env.setProperty(ParameterQueue.USER_NAME, "guest");