diff --git a/spring-userservice/src/main/java/org/baeldung/user/dao/MyUserDAO.java b/spring-userservice/src/main/java/org/baeldung/user/dao/MyUserDAO.java
index 5741d19bf2..4cc9f61b4a 100644
--- a/spring-userservice/src/main/java/org/baeldung/user/dao/MyUserDAO.java
+++ b/spring-userservice/src/main/java/org/baeldung/user/dao/MyUserDAO.java
@@ -29,6 +29,12 @@ public class MyUserDAO {
         entityManager.persist(user);
         return user;
     }
+    
+    public void removeUserByUsername(String username) {
+        final Query query = entityManager.createQuery("delete from MyUser where username=:username");
+        query.setParameter("username", username);
+        query.executeUpdate();
+    }
 
     public EntityManager getEntityManager() {
         return entityManager;
diff --git a/spring-userservice/src/main/java/org/baeldung/user/service/MyUserService.java b/spring-userservice/src/main/java/org/baeldung/user/service/MyUserService.java
index f4705f3193..891d6863ce 100644
--- a/spring-userservice/src/main/java/org/baeldung/user/service/MyUserService.java
+++ b/spring-userservice/src/main/java/org/baeldung/user/service/MyUserService.java
@@ -1,5 +1,8 @@
 package org.baeldung.user.service;
 
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
 import org.baeldung.persistence.model.MyUser;
 import org.baeldung.user.dao.MyUserDAO;
 import org.baeldung.web.MyUserDto;
@@ -14,6 +17,9 @@ public class MyUserService {
 
     @Autowired
     private PasswordEncoder passwordEncoder;
+    
+    @PersistenceContext
+    private EntityManager entityManager;
 
     @Autowired
     MyUserDAO myUserDAO;
@@ -33,6 +39,10 @@ public class MyUserService {
         final MyUser user = myUserDAO.findByUsername(username);
         return user;
     }
+    
+    public void removeUserByUsername(String username){
+        myUserDAO.removeUserByUsername(username);
+    }
 
     private boolean usernameExists(final String username) {
         final MyUser user = myUserDAO.findByUsername(username);
diff --git a/spring-userservice/src/test/java/org/baeldung/userservice/CustomUserDetailsServiceTest.java b/spring-userservice/src/test/java/org/baeldung/userservice/CustomUserDetailsServiceTest.java
new file mode 100644
index 0000000000..29998b8fea
--- /dev/null
+++ b/spring-userservice/src/test/java/org/baeldung/userservice/CustomUserDetailsServiceTest.java
@@ -0,0 +1,59 @@
+package org.baeldung.userservice;
+
+import org.baeldung.custom.config.MvcConfig;
+import org.baeldung.custom.config.PersistenceDerbyJPAConfig;
+import org.baeldung.custom.config.SecSecurityConfig;
+import org.baeldung.user.service.MyUserService;
+import org.baeldung.web.MyUserDto;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.SpringApplicationConfiguration;
+import org.springframework.security.authentication.AuthenticationProvider;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.web.WebAppConfiguration;
+import static org.junit.Assert.*;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringApplicationConfiguration(classes = { MvcConfig.class, PersistenceDerbyJPAConfig.class, SecSecurityConfig.class })
+@WebAppConfiguration
+public class CustomUserDetailsServiceTest {
+
+    private static final Logger LOG = Logger.getLogger("CustomUserDetailsServiceTest");
+
+    public static final String USERNAME = "user";
+    public static final String PASSWORD = "pass";
+
+    @Autowired
+    MyUserService myUserService;
+
+    @Autowired
+    AuthenticationProvider authenticationProvider;
+
+    @Test
+    public void whenAuthenticateUser_thenRetrieveFromDb() {
+        try {
+            MyUserDto userDTO = new MyUserDto();
+            userDTO.setUsername(USERNAME);
+            userDTO.setPassword(PASSWORD);
+
+            myUserService.registerNewUserAccount(userDTO);
+
+            UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken(USERNAME, PASSWORD);
+            Authentication authentication = authenticationProvider.authenticate(auth);
+
+            assertEquals(authentication.getName(), USERNAME);
+
+        } catch (Exception exc) {
+            LOG.log(Level.SEVERE, "Error creating account");
+        } finally {
+            myUserService.removeUserByUsername(USERNAME);
+        }
+    }
+
+}