diff --git a/.gitignore b/.gitignore
index 9d6afd6..05fbf3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,101 @@
 .idea/
 *.iml
-**/target/*
-.project
-.settings
+
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+/.project
+
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+
+# Maven 
+target/
+
+# Eclipse Files
+.settings/
+.loadpath
+.recommenders
 .classpath
+.project
+
+# VSCode
+.vscode/
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
+.cproject
+
+# CDT- autotools
+.autotools
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# Tern plugin
+.tern-project
+
+# TeXlipse plugin
+.texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
+
+# Annotation Processing
+.apt_generated/
+.apt_generated_test/
+
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet
+
+# Uncomment this line if you wish to ignore the project description file.
+# Typically, this file would be tracked if it contains build/dependency configurations:
+#.pr
+
+# Maven artifact when using shade plugin
+dependency-reduced-pom.xml
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 9e38722..025919d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <slf4j.version>1.7.30</slf4j.version>
         <java.version>1.8</java.version>
-        <junit.version>4.13.1</junit.version>
+        <junit.version>5.9.2</junit.version>
         <assertj.version>3.17.2</assertj.version>
         <mockito.version>3.5.13</mockito.version>
         <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
@@ -78,8 +78,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
             <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
diff --git a/src/test/java/org/jeasy/flows/engine/WorkFlowEngineImplTest.java b/src/test/java/org/jeasy/flows/engine/WorkFlowEngineImplTest.java
index 31aaf1f..b1fb7ae 100644
--- a/src/test/java/org/jeasy/flows/engine/WorkFlowEngineImplTest.java
+++ b/src/test/java/org/jeasy/flows/engine/WorkFlowEngineImplTest.java
@@ -34,7 +34,7 @@
 import org.jeasy.flows.work.WorkReport;
 import org.jeasy.flows.work.WorkStatus;
 import org.jeasy.flows.workflow.*;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -50,7 +50,7 @@ public class WorkFlowEngineImplTest {
     private final WorkFlowEngine workFlowEngine = new WorkFlowEngineImpl();
 
     @Test
-    public void run() {
+    void run() {
         // given
         WorkFlow workFlow = Mockito.mock(WorkFlow.class);
         WorkContext workContext = Mockito.mock(WorkContext.class);
@@ -67,7 +67,7 @@ public void run() {
      */
 
     @Test
-    public void composeWorkFlowFromSeparateFlowsAndExecuteIt() {
+    void composeWorkFlowFromSeparateFlowsAndExecuteIt() {
 
         PrintMessageWork work1 = new PrintMessageWork("foo");
         PrintMessageWork work2 = new PrintMessageWork("hello");
@@ -107,7 +107,7 @@ public void composeWorkFlowFromSeparateFlowsAndExecuteIt() {
     }
 
     @Test
-    public void defineWorkFlowInlineAndExecuteIt() {
+    void defineWorkFlowInlineAndExecuteIt() {
 
         PrintMessageWork work1 = new PrintMessageWork("foo");
         PrintMessageWork work2 = new PrintMessageWork("hello");
@@ -141,7 +141,7 @@ public void defineWorkFlowInlineAndExecuteIt() {
     }
 
     @Test
-    public void useWorkContextToPassInitialParametersAndShareDataBetweenWorkUnits() {
+    void useWorkContextToPassInitialParametersAndShareDataBetweenWorkUnits() {
         WordCountWork work1 = new WordCountWork(1);
         WordCountWork work2 = new WordCountWork(2);
         AggregateWordCountsWork work3 = new AggregateWordCountsWork();
diff --git a/src/test/java/org/jeasy/flows/work/NoOpWorkTest.java b/src/test/java/org/jeasy/flows/work/NoOpWorkTest.java
index d921ca1..ab2d9c3 100644
--- a/src/test/java/org/jeasy/flows/work/NoOpWorkTest.java
+++ b/src/test/java/org/jeasy/flows/work/NoOpWorkTest.java
@@ -23,23 +23,24 @@
  */
 package org.jeasy.flows.work;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
 import org.assertj.core.api.Assertions;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class NoOpWorkTest {
 
 	private final NoOpWork work = new NoOpWork();
 
-	@Test
-	public void getName() {
+    @Test
+    void getName() {
 		Assertions.assertThat(work.getName()).isNotNull();
 	}
 
-	@Test
-	public void testExecute() {
+    @Test
+    void testExecute() {
 		WorkReport workReport = work.execute(new WorkContext());
-		Assert.assertNotNull(workReport);
+		assertNotNull(workReport);
 		Assertions.assertThat(workReport.getStatus()).isEqualTo(WorkStatus.COMPLETED);
 
 	}
diff --git a/src/test/java/org/jeasy/flows/workflow/ConditionalFlowTest.java b/src/test/java/org/jeasy/flows/workflow/ConditionalFlowTest.java
index 024f7df..b905772 100644
--- a/src/test/java/org/jeasy/flows/workflow/ConditionalFlowTest.java
+++ b/src/test/java/org/jeasy/flows/workflow/ConditionalFlowTest.java
@@ -26,13 +26,13 @@
 import org.jeasy.flows.work.Work;
 import org.jeasy.flows.work.WorkContext;
 import org.jeasy.flows.work.WorkReportPredicate;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 public class ConditionalFlowTest {
 
     @Test
-    public void callOnPredicateSuccess() {
+    void callOnPredicateSuccess() {
         // given
         Work toExecute = Mockito.mock(Work.class);
         Work nextOnPredicateSuccess = Mockito.mock(Work.class);
@@ -57,7 +57,7 @@ public void callOnPredicateSuccess() {
     }
 
     @Test
-    public void callOnPredicateFailure() {
+    void callOnPredicateFailure() {
         // given
         Work toExecute = Mockito.mock(Work.class);
         Work nextOnPredicateSuccess = Mockito.mock(Work.class);
diff --git a/src/test/java/org/jeasy/flows/workflow/ParallelFlowExecutorTest.java b/src/test/java/org/jeasy/flows/workflow/ParallelFlowExecutorTest.java
index 4011703..21ad5f1 100644
--- a/src/test/java/org/jeasy/flows/workflow/ParallelFlowExecutorTest.java
+++ b/src/test/java/org/jeasy/flows/workflow/ParallelFlowExecutorTest.java
@@ -29,7 +29,7 @@
 import org.jeasy.flows.work.WorkContext;
 import org.jeasy.flows.work.WorkReport;
 import org.jeasy.flows.work.WorkStatus;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import java.util.Arrays;
@@ -40,7 +40,7 @@
 public class ParallelFlowExecutorTest {
 
     @Test
-    public void testExecute() {
+    void testExecute() {
 
         // given
         ExecutorService executorService = Executors.newFixedThreadPool(2);
diff --git a/src/test/java/org/jeasy/flows/workflow/ParallelFlowReportTest.java b/src/test/java/org/jeasy/flows/workflow/ParallelFlowReportTest.java
index e037237..ce0a05b 100644
--- a/src/test/java/org/jeasy/flows/workflow/ParallelFlowReportTest.java
+++ b/src/test/java/org/jeasy/flows/workflow/ParallelFlowReportTest.java
@@ -27,15 +27,15 @@
 import org.jeasy.flows.work.DefaultWorkReport;
 import org.jeasy.flows.work.WorkContext;
 import org.jeasy.flows.work.WorkStatus;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class ParallelFlowReportTest {
 
 	private Exception exception;
 	private ParallelFlowReport parallelFlowReport;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		exception = new Exception("test exception");
 		WorkContext workContext = new WorkContext();
@@ -44,18 +44,18 @@ public void setUp() {
 		parallelFlowReport.add(new DefaultWorkReport(WorkStatus.COMPLETED, workContext));
 	}
 
-	@Test
-	public void testGetStatus() {
+    @Test
+    void testGetStatus() {
 		Assertions.assertThat(parallelFlowReport.getStatus()).isEqualTo(WorkStatus.FAILED);
 	}
 
-	@Test
-	public void testGetError() {
+    @Test
+    void testGetError() {
 		Assertions.assertThat(parallelFlowReport.getError()).isEqualTo(exception);
 	}
 
-	@Test
-	public void testGetReports() {
+    @Test
+    void testGetReports() {
 		Assertions.assertThat(parallelFlowReport.getReports()).hasSize(2);
 	}
 }
diff --git a/src/test/java/org/jeasy/flows/workflow/ParallelFlowTest.java b/src/test/java/org/jeasy/flows/workflow/ParallelFlowTest.java
index b4f7f5b..dbe3f23 100644
--- a/src/test/java/org/jeasy/flows/workflow/ParallelFlowTest.java
+++ b/src/test/java/org/jeasy/flows/workflow/ParallelFlowTest.java
@@ -26,7 +26,7 @@
 import org.assertj.core.api.Assertions;
 import org.jeasy.flows.work.Work;
 import org.jeasy.flows.work.WorkContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 import java.util.Arrays;
@@ -35,7 +35,7 @@
 public class ParallelFlowTest {
 
     @Test
-    public void testExecute() {
+    void testExecute() {
         // given
         Work work1 = Mockito.mock(Work.class);
         Work work2 = Mockito.mock(Work.class);
diff --git a/src/test/java/org/jeasy/flows/workflow/RepeatFlowTest.java b/src/test/java/org/jeasy/flows/workflow/RepeatFlowTest.java
index 30b80ec..83196e9 100644
--- a/src/test/java/org/jeasy/flows/workflow/RepeatFlowTest.java
+++ b/src/test/java/org/jeasy/flows/workflow/RepeatFlowTest.java
@@ -26,13 +26,13 @@
 import org.jeasy.flows.work.Work;
 import org.jeasy.flows.work.WorkContext;
 import org.jeasy.flows.work.WorkReportPredicate;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
 public class RepeatFlowTest {
 
     @Test
-    public void testRepeatUntil() {
+    void testRepeatUntil() {
         // given
         Work work = Mockito.mock(Work.class);
         WorkContext workContext = Mockito.mock(WorkContext.class);
@@ -50,7 +50,7 @@ public void testRepeatUntil() {
     }
 
     @Test
-    public void testRepeatTimes() {
+    void testRepeatTimes() {
         // given
         Work work = Mockito.mock(Work.class);
         WorkContext workContext = Mockito.mock(WorkContext.class);
diff --git a/src/test/java/org/jeasy/flows/workflow/SequentialFlowTest.java b/src/test/java/org/jeasy/flows/workflow/SequentialFlowTest.java
index 633202e..b4aef76 100644
--- a/src/test/java/org/jeasy/flows/workflow/SequentialFlowTest.java
+++ b/src/test/java/org/jeasy/flows/workflow/SequentialFlowTest.java
@@ -28,14 +28,14 @@
 
 import org.jeasy.flows.work.Work;
 import org.jeasy.flows.work.WorkContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.mockito.InOrder;
 import org.mockito.Mockito;
 
 public class SequentialFlowTest {
 
     @Test
-    public void testExecute() {
+    void testExecute() {
         // given
         Work work1 = Mockito.mock(Work.class);
         Work work2 = Mockito.mock(Work.class);
@@ -59,7 +59,7 @@ public void testExecute() {
     }
 
     @Test
-    public void testPassingMultipleWorkUnitsAtOnce() {
+    void testPassingMultipleWorkUnitsAtOnce() {
         // given
         Work work1 = Mockito.mock(Work.class);
         Work work2 = Mockito.mock(Work.class);