diff --git a/src/main/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBean.java b/src/main/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBean.java
index 3e8f5203..b28a531b 100644
--- a/src/main/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBean.java
@@ -39,7 +39,6 @@ import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.ApplicationListener;
 import org.springframework.data.gemfire.snapshot.event.ExportSnapshotApplicationEvent;
-import org.springframework.data.gemfire.snapshot.event.ImportSnapshotApplicationEvent;
 import org.springframework.data.gemfire.snapshot.event.SnapshotApplicationEvent;
 import org.springframework.data.gemfire.util.CollectionUtils;
 import org.springframework.util.Assert;
diff --git a/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanTest.java b/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanTest.java
index 8f9bc910..e8be26c6 100644
--- a/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanTest.java
+++ b/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceFactoryBeanTest.java
@@ -124,6 +124,16 @@ public class SnapshotServiceFactoryBeanTest {
 		return metadata;
 	}
 
+	protected String toPathname(String... pathElements) {
+		StringBuilder pathname = new StringBuilder();
+
+		for (String pathElement : pathElements) {
+			pathname.append(File.separator).append(pathElement);
+		}
+
+		return pathname.toString();
+	}
+
 	@BeforeClass
 	public static void setupBeforeClass() throws Exception {
 		snapshotDat = mockFile("snapshot.dat");
@@ -915,11 +925,11 @@ public class SnapshotServiceFactoryBeanTest {
 	public void toSimpleFilenameUsingVariousPathnames() {
 		TestSnapshotServiceAdapter snapshotService = new TestSnapshotServiceAdapter();
 
-		assertThat(snapshotService.toSimpleFilename("/path/to/file.ext"), is(equalTo("file.ext")));
-		assertThat(snapshotService.toSimpleFilename("/path/to/file   "), is(equalTo("file")));
-		assertThat(snapshotService.toSimpleFilename("/ file.ext"), is(equalTo("file.ext")));
+		assertThat(snapshotService.toSimpleFilename(toPathname("path", "to", "file.ext")), is(equalTo("file.ext")));
+		assertThat(snapshotService.toSimpleFilename(toPathname("path", "to", "file   ")), is(equalTo("file")));
+		assertThat(snapshotService.toSimpleFilename(toPathname("  file.ext ")), is(equalTo("file.ext")));
 		assertThat(snapshotService.toSimpleFilename("  file.ext "), is(equalTo("file.ext")));
-		assertThat(snapshotService.toSimpleFilename("/ "), is(equalTo("")));
+		assertThat(snapshotService.toSimpleFilename(File.separator.concat(" ")), is(equalTo("")));
 		assertThat(snapshotService.toSimpleFilename("  "), is(equalTo("")));
 		assertThat(snapshotService.toSimpleFilename(""), is(equalTo("")));
 		assertThat(snapshotService.toSimpleFilename(null), is(nullValue()));
diff --git a/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceImportExportIntegrationTest.java b/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceImportExportIntegrationTest.java
index f6b0b3bc..b71fbce1 100644
--- a/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceImportExportIntegrationTest.java
+++ b/src/test/java/org/springframework/data/gemfire/snapshot/SnapshotServiceImportExportIntegrationTest.java
@@ -105,8 +105,7 @@ public class SnapshotServiceImportExportIntegrationTest {
 		assertThat(importPeopleSnapshot.length() > 0, is(true));
 
 		applicationContext = new ClassPathXmlApplicationContext(
-			SnapshotServiceImportExportIntegrationTest.class.getName().replaceAll("\\.", File.separator)
-				.concat("-context.xml"));
+			SnapshotServiceImportExportIntegrationTest.class.getName().replace(".", "/").concat("-context.xml"));
 
 		applicationContext.registerShutdownHook();