diff --git a/integration/src/test/java/org/hibernate/validator/integration/cdi/ConstraintValidatorInjectionUnitIT.java b/integration/src/test/java/org/hibernate/validator/integration/cdi/ConstraintValidatorInjectionUnitIT.java
index b7b2e39931..b36b2a409a 100644
--- a/integration/src/test/java/org/hibernate/validator/integration/cdi/ConstraintValidatorInjectionUnitIT.java
+++ b/integration/src/test/java/org/hibernate/validator/integration/cdi/ConstraintValidatorInjectionUnitIT.java
@@ -35,7 +35,7 @@
 import org.hibernate.validator.integration.cdi.service.PingServiceImpl;
 import org.hibernate.validator.integration.util.IntegrationTestUtil;
 
-import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertNotNull;
 
 /**
  * @author Hardy Ferentschik
diff --git a/integration/src/test/java/org/hibernate/validator/integration/cdi/DefaultInjectionUnitIT.java b/integration/src/test/java/org/hibernate/validator/integration/cdi/DefaultInjectionUnitIT.java
index 1bb51ff61f..ae83638c59 100644
--- a/integration/src/test/java/org/hibernate/validator/integration/cdi/DefaultInjectionUnitIT.java
+++ b/integration/src/test/java/org/hibernate/validator/integration/cdi/DefaultInjectionUnitIT.java
@@ -28,7 +28,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertNotNull;
 
 /**
  * @author Hardy Ferentschik
diff --git a/integration/src/test/java/org/hibernate/validator/integration/jbossas7/CustomValidatorFactoryInPersistenceUnitIT.java b/integration/src/test/java/org/hibernate/validator/integration/jbossas7/CustomValidatorFactoryInPersistenceUnitIT.java
index 9e0a78bda0..c442cabcce 100644
--- a/integration/src/test/java/org/hibernate/validator/integration/jbossas7/CustomValidatorFactoryInPersistenceUnitIT.java
+++ b/integration/src/test/java/org/hibernate/validator/integration/jbossas7/CustomValidatorFactoryInPersistenceUnitIT.java
@@ -37,7 +37,7 @@
 
 import org.hibernate.validator.integration.util.IntegrationTestUtil;
 
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Tests the integration of Hibernate Validator in JBoss AS 7
@@ -89,7 +89,7 @@ public void testValidatorFactoryPassedToPersistenceUnit() throws Exception {
 		// under javax.persistence.validation.factory. This works for the JBoss AS purposes, but not generically
 		Object obj = properties.get( "javax.persistence.validation.factory" );
 		assertTrue( "There should be an object under this property", obj != null );
-		ValidatorFactory factory = ( ValidatorFactory ) obj;
+		ValidatorFactory factory = (ValidatorFactory) obj;
 //		assertTrue(
 //				"The Custom Validator implementation should be used",
 //				factory instanceof MyValidationProvider.DummyValidatorFactory
diff --git a/integration/src/test/java/org/hibernate/validator/integration/jbossas7/DefaultValidatorFactoryInPersistenceUnitIT.java b/integration/src/test/java/org/hibernate/validator/integration/jbossas7/DefaultValidatorFactoryInPersistenceUnitIT.java
index 80c46088e3..c948a0e209 100644
--- a/integration/src/test/java/org/hibernate/validator/integration/jbossas7/DefaultValidatorFactoryInPersistenceUnitIT.java
+++ b/integration/src/test/java/org/hibernate/validator/integration/jbossas7/DefaultValidatorFactoryInPersistenceUnitIT.java
@@ -37,8 +37,8 @@
 
 import org.hibernate.validator.integration.util.IntegrationTestUtil;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 /**
  * Tests the integration of Hibernate Validator in JBoss AS 7
@@ -88,7 +88,7 @@ public void testValidatorFactoryPassedToPersistenceUnit() throws Exception {
 		// under javax.persistence.validation.factory. This works for the JBoss AS purposes, but not generically
 		Object obj = properties.get( "javax.persistence.validation.factory" );
 		assertTrue( "There should be an object under this property", obj != null );
-		ValidatorFactory factory = ( ValidatorFactory ) obj;
+		ValidatorFactory factory = (ValidatorFactory) obj;
 		assertEquals(
 				"The Hibernate Validator implementation should be used",
 				"ValidatorImpl",
diff --git a/integration/src/test/java/org/hibernate/validator/integration/jbossas7/JndiLookupOfValidatorFactoryIT.java b/integration/src/test/java/org/hibernate/validator/integration/jbossas7/JndiLookupOfValidatorFactoryIT.java
index 5a13c59f59..7db934d26f 100644
--- a/integration/src/test/java/org/hibernate/validator/integration/jbossas7/JndiLookupOfValidatorFactoryIT.java
+++ b/integration/src/test/java/org/hibernate/validator/integration/jbossas7/JndiLookupOfValidatorFactoryIT.java
@@ -32,9 +32,9 @@
 
 import org.hibernate.validator.integration.util.IntegrationTestUtil;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 /**
  * Tests the integration of Hibernate Validator in JBoss AS 7.