diff --git a/pom.xml b/pom.xml
index a29a572b..8aa21d5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,13 +49,19 @@
             <version>2.5</version>
         </dependency>
 
-        <!-- TEST DEPENDENCIES -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>1.7.21</version>
+        </dependency>
+
         <dependency>
             <groupId>commons-logging</groupId>
             <artifactId>commons-logging</artifactId>
             <version>1.2</version>
-            <scope>test</scope>
         </dependency>
+
+        <!-- TEST DEPENDENCIES -->
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
@@ -163,6 +169,14 @@
                     <tag>${project.version}</tag>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/src/main/java/redis/embedded/AbstractRedisInstance.java b/src/main/java/redis/embedded/AbstractRedisInstance.java
index 7dd75428..2e3c9ba7 100644
--- a/src/main/java/redis/embedded/AbstractRedisInstance.java
+++ b/src/main/java/redis/embedded/AbstractRedisInstance.java
@@ -1,6 +1,8 @@
 package redis.embedded;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import redis.embedded.exceptions.EmbeddedRedisException;
 
 import java.io.*;
@@ -11,9 +13,12 @@
 import java.util.concurrent.Executors;
 
 abstract class AbstractRedisInstance implements Redis {
+
+    private static Log log = LogFactory.getLog(AbstractRedisInstance.class);
+
     protected List<String> args = Collections.emptyList();
     private volatile boolean active = false;
-	private Process redisProcess;
+    private Process redisProcess;
     private final int port;
 
     private ExecutorService executor;
@@ -32,6 +37,7 @@ public synchronized void start() throws EmbeddedRedisException {
         }
         try {
             redisProcess = createRedisProcessBuilder().start();
+            installExitHook();
             logErrors();
             awaitRedisServerReady();
             active = true;
@@ -40,6 +46,10 @@ public synchronized void start() throws EmbeddedRedisException {
         }
     }
 
+    private void installExitHook() {
+        Runtime.getRuntime().addShutdownHook(new Thread(this::stop, "RedisInstanceCleaner"));
+    }
+
     private void logErrors() {
         final InputStream errorStream = redisProcess.getErrorStream();
         BufferedReader reader = new BufferedReader(new InputStreamReader(errorStream));
@@ -57,9 +67,8 @@ private void awaitRedisServerReady() throws IOException {
                 outputLine = reader.readLine();
                 if (outputLine == null) {
                     //Something goes wrong. Stream is ended before server was activated.
-                    throw new RuntimeException("Can't start redis server. Check logs for details. Redis process log: "+outputStringBuffer.toString());
-                }
-                else{
+                    throw new RuntimeException("Can't start redis server. Check logs for details. Redis process log: " + outputStringBuffer.toString());
+                } else {
                     outputStringBuffer.append("\n");
                     outputStringBuffer.append(outputLine);
                 }
@@ -80,11 +89,14 @@ private ProcessBuilder createRedisProcessBuilder() {
 
     public synchronized void stop() throws EmbeddedRedisException {
         if (active) {
+            log.info("Stopping redis server...");
+
             if (executor != null && !executor.isShutdown()) {
                 executor.shutdown();
             }
             redisProcess.destroy();
             tryWaitFor();
+            log.info("Redis exited");
             active = false;
         }
     }