diff --git a/src/test/java/teetime/framework/exceptionHandling/TestListener.java b/src/test/java/teetime/framework/exceptionHandling/TestListener.java
deleted file mode 100644
index 79f3dd549dccd88715e62d3ecabd3c7d5b3d51aa..0000000000000000000000000000000000000000
--- a/src/test/java/teetime/framework/exceptionHandling/TestListener.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Copyright (C) 2015 Christian Wulf, Nelson Tavares de Sousa (http://christianwulf.github.io/teetime)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package teetime.framework.exceptionHandling;
-
-import teetime.framework.AbstractStage;
-
-public class TestListener extends AbstractExceptionListener {
-
-	protected TestListener() {
-		super(false);
-	}
-
-	private int numExceptionsInvoked;
-
-	@Override
-	public FurtherExecution onStageException(final Exception e, final AbstractStage throwingStage) {
-		numExceptionsInvoked++;
-		if (numExceptionsInvoked == 2) {
-			return FurtherExecution.TERMINATE;
-		} else {
-			return FurtherExecution.CONTINUE;
-		}
-	}
-
-	public int getNumExceptionsInvoked() {
-		return numExceptionsInvoked;
-	}
-
-}
diff --git a/src/test/java/teetime/framework/exceptionHandling/TestListenerFactory.java b/src/test/java/teetime/framework/exceptionHandling/TestListenerFactory.java
deleted file mode 100644
index b4ebf7141b8967ad608b6ba6c7097b3a50a3a135..0000000000000000000000000000000000000000
--- a/src/test/java/teetime/framework/exceptionHandling/TestListenerFactory.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Copyright (C) 2015 Christian Wulf, Nelson Tavares de Sousa (http://christianwulf.github.io/teetime)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package teetime.framework.exceptionHandling;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class TestListenerFactory extends AbstractExceptionListenerFactory<TestListener> {
-
-	private final List<TestListener> instances = new ArrayList<TestListener>();
-
-	@Override
-	public TestListener createInstance() {
-		TestListener listener = new TestListener();
-		instances.add(listener);
-		return listener;
-	}
-
-	public List<TestListener> getInstances() {
-		return instances;
-	}
-
-}