diff --git a/datamover/sourceTest/java/ch/systemsx/cisd/datamover/SelfTestTest.java b/datamover/sourceTest/java/ch/systemsx/cisd/datamover/SelfTestTest.java
index a9552fd336c095124f38945d00c44eef478baa93..f18c19a16ee5d34070db8811598a50bc201cb65e 100644
--- a/datamover/sourceTest/java/ch/systemsx/cisd/datamover/SelfTestTest.java
+++ b/datamover/sourceTest/java/ch/systemsx/cisd/datamover/SelfTestTest.java
@@ -24,7 +24,6 @@ import org.testng.annotations.Test;
 
 import ch.systemsx.cisd.common.exceptions.ConfigurationFailureException;
 import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
-import ch.systemsx.cisd.common.exceptions.NotImplementedException;
 import ch.systemsx.cisd.common.exceptions.Status;
 import ch.systemsx.cisd.common.logging.LogInitializer;
 import ch.systemsx.cisd.common.utilities.FileUtilities;
@@ -133,10 +132,10 @@ public class SelfTestTest
     // Test cases.
     //
 
-    @Test(expectedExceptions = NotImplementedException.class)
+    @Test(expectedExceptions = ConfigurationFailureException.class)
     public void testHappyCaseWithRemoteHost()
     {
-        final String outgoingHost = "some_remote_host";
+        final String outgoingHost = "unknown_remote_host";
         final IFileStore remoteHostOutgoingStore =
                 createRemoteStore(outgoingDirectory, outgoingHost, "outgoing");
         SelfTest.check(mockCopier, remoteHostOutgoingStore);