diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/metadata/PropertiesBasedMetadataPersister.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/metadata/PropertiesBasedMetadataPersister.java
index 0a939fcf84..49c7c2f9c3 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/metadata/PropertiesBasedMetadataPersister.java
+++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/metadata/PropertiesBasedMetadataPersister.java
@@ -205,32 +205,7 @@ public class PropertiesBasedMetadataPersister implements MetadataPersister<Strin
         this.bootstrapResources.add(location);
     }
 
-    public static void main(String[] arrImAPirate) throws Throwable {
-        File desktopProperties = new File(System.getProperty("user.home"), "Desktop/xmppProperties.properties");
-        FileSystemResource fileSystemResource = new FileSystemResource(desktopProperties);
-
-        final PropertiesBasedMetadataPersister propertiesBasedMetadataPersister = new PropertiesBasedMetadataPersister(fileSystemResource);
-        propertiesBasedMetadataPersister.setSupportAsyncWrites(true);
-        propertiesBasedMetadataPersister.setExecutor( new SimpleAsyncTaskExecutor());
-        propertiesBasedMetadataPersister.afterPropertiesSet();
-        class IncrementingWriter implements Runnable {
-            private int value;
-
-            public IncrementingWriter(int v) {
-                this.value = v;
-            }
-
-            public void run() {
-                propertiesBasedMetadataPersister.write("sinceId", value + "");
-                System.out.println("value written " + value + ", value retreived " + propertiesBasedMetadataPersister.read("sinceId"));
-            }
-        }
-
-        for (int i = 1; i <= 30; i++) {
-            new Thread(new IncrementingWriter(i)).start();
-            Thread.sleep(100);
-        }
-    }
+    
 
     /**
      * This class is used to ensure that the properies are persisted to the right place as soon as capacity / the task Scheduler allows
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/metadata/PropertiesBasedMetadataPersisterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/metadata/PropertiesBasedMetadataPersisterTests.java
new file mode 100644
index 0000000000..d926daeed3
--- /dev/null
+++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/metadata/PropertiesBasedMetadataPersisterTests.java
@@ -0,0 +1,99 @@
+package org.springframework.integration.endpoint.metadata;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.springframework.core.io.FileSystemResource;
+import org.springframework.core.task.SimpleAsyncTaskExecutor;
+
+import java.io.*;
+
+
+/**
+ * Tests the functionality of {@link PropertiesBasedMetadataPersister}
+ *
+ * @author Josh Long
+ */
+public class PropertiesBasedMetadataPersisterTests {
+
+    private FileSystemResource fileSystemResource;
+    private PropertiesBasedMetadataPersister propertiesBasedMetadataPersister;
+
+    @Before
+    public void setUp() throws Throwable {
+        File tmpFile = new File(System.getProperty("java.io.tmpdir"), System.currentTimeMillis() + ".properties");
+        fileSystemResource = new FileSystemResource(tmpFile);
+
+        if (tmpFile.exists()) {
+            tmpFile.delete();
+        }
+    }
+
+    @After
+    public void tearDown() throws Throwable {
+        if ((this.fileSystemResource != null) && this.fileSystemResource.getFile().exists()) {
+            this.fileSystemResource.getFile().delete();
+        }
+    }
+
+    @Test
+    public void testAsyncMetadataPersistence() throws Throwable {
+        propertiesBasedMetadataPersister = new PropertiesBasedMetadataPersister(fileSystemResource);
+        propertiesBasedMetadataPersister.setSupportAsyncWrites(true);
+        propertiesBasedMetadataPersister.setExecutor(new SimpleAsyncTaskExecutor());
+        propertiesBasedMetadataPersister.afterPropertiesSet();
+
+        for (int i = 1; i <= 30; i++) {
+            propertiesBasedMetadataPersister.write("sinceId", i + "");
+            System.out.println("value written " + i + ", value retreived " + propertiesBasedMetadataPersister.read("sinceId"));
+        }
+
+        Thread.sleep(1000);
+        Assert.assertTrue(contentsOfFile(fileSystemResource.getFile()).contains("sinceId=30"));
+    }
+    private  String contentsOfFile(File f) {
+        String txt = null;
+        int width = 300;
+        Reader reader = null;
+
+        try {
+            StringBuffer stringBuffer = new StringBuffer(width);
+            reader = new FileReader(f);
+
+            char[] values = new char[width];
+
+            while (reader.read(values) != -1) {
+                stringBuffer.append(values);
+            }
+
+            txt = stringBuffer.toString().trim();
+        } catch (Throwable e) {
+            throw new RuntimeException(e);
+        } finally {
+            try {
+                if (reader != null) {
+                    reader.close();
+                }
+            } catch (IOException e) {
+                // eat it
+            }
+        }
+
+        return txt;
+    }
+
+    @Test
+    public void testSyncMetadataPersistence() throws Throwable {
+        propertiesBasedMetadataPersister = new PropertiesBasedMetadataPersister(fileSystemResource);
+        propertiesBasedMetadataPersister.afterPropertiesSet();
+
+        for (int i = 1; i <= 30; i++) {
+            propertiesBasedMetadataPersister.write("sinceId", i + "");
+            System.out.println("value written " + i + ", value retreived " + propertiesBasedMetadataPersister.read("sinceId"));
+        }
+
+        Assert.assertTrue(contentsOfFile(fileSystemResource.getFile()).contains("sinceId=30"));
+    }
+}