diff --git a/src/main/java/com/commafeed/CommaFeedConfiguration.java b/src/main/java/com/commafeed/CommaFeedConfiguration.java
index 2c190ec1..0131967b 100644
--- a/src/main/java/com/commafeed/CommaFeedConfiguration.java
+++ b/src/main/java/com/commafeed/CommaFeedConfiguration.java
@@ -5,10 +5,10 @@ import java.util.ResourceBundle;
 
 import javax.validation.Valid;
 import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 import org.apache.commons.lang3.time.DateUtils;
-import org.hibernate.validator.constraints.NotBlank;
 
 import com.commafeed.backend.cache.RedisPoolFactory;
 import com.commafeed.frontend.session.SessionHandlerFactory;
diff --git a/src/main/java/com/commafeed/frontend/model/request/PasswordResetRequest.java b/src/main/java/com/commafeed/frontend/model/request/PasswordResetRequest.java
index 39454217..75c5d841 100644
--- a/src/main/java/com/commafeed/frontend/model/request/PasswordResetRequest.java
+++ b/src/main/java/com/commafeed/frontend/model/request/PasswordResetRequest.java
@@ -2,8 +2,8 @@ package com.commafeed.frontend.model.request;
 
 import java.io.Serializable;
 
-import org.hibernate.validator.constraints.Email;
-import org.hibernate.validator.constraints.NotEmpty;
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotEmpty;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
diff --git a/src/main/java/com/commafeed/frontend/model/request/RegistrationRequest.java b/src/main/java/com/commafeed/frontend/model/request/RegistrationRequest.java
index 08a52266..0977d2cc 100644
--- a/src/main/java/com/commafeed/frontend/model/request/RegistrationRequest.java
+++ b/src/main/java/com/commafeed/frontend/model/request/RegistrationRequest.java
@@ -2,9 +2,10 @@ package com.commafeed.frontend.model.request;
 
 import java.io.Serializable;
 
-import org.hibernate.validator.constraints.Email;
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotEmpty;
+
 import org.hibernate.validator.constraints.Length;
-import org.hibernate.validator.constraints.NotEmpty;
 
 import com.commafeed.frontend.auth.ValidPassword;
 
diff --git a/src/test/java/com/commafeed/backend/opml/OPMLExporterTest.java b/src/test/java/com/commafeed/backend/opml/OPMLExporterTest.java
index 7ed58316..208f9cf2 100644
--- a/src/test/java/com/commafeed/backend/opml/OPMLExporterTest.java
+++ b/src/test/java/com/commafeed/backend/opml/OPMLExporterTest.java
@@ -41,7 +41,7 @@ public class OPMLExporterTest {
 
 	@Before
 	public void init() {
-		MockitoAnnotations.initMocks(this);
+		MockitoAnnotations.openMocks(this);
 
 		user.setName("John Doe");
 
diff --git a/src/test/java/com/commafeed/backend/service/UserServiceTest.java b/src/test/java/com/commafeed/backend/service/UserServiceTest.java
index 2ff4de13..15ede28e 100644
--- a/src/test/java/com/commafeed/backend/service/UserServiceTest.java
+++ b/src/test/java/com/commafeed/backend/service/UserServiceTest.java
@@ -47,7 +47,7 @@ public class UserServiceTest {
 
 	@Before
 	public void init() {
-		MockitoAnnotations.initMocks(this);
+		MockitoAnnotations.openMocks(this);
 
 		userService = new UserService(feedCategoryDAO, feedSubscriptionDAO, userDAO, userRoleDAO, userSettingsDAO,
 				passwordEncryptionService, commaFeedConfiguration, postLoginActivities);