diff --git a/test/org/jivesoftware/smackx/FileTransferTest.java b/test/org/jivesoftware/smackx/FileTransferTest.java
new file mode 100644
index 000000000..0dfbb0e28
--- /dev/null
+++ b/test/org/jivesoftware/smackx/FileTransferTest.java
@@ -0,0 +1,111 @@
+/**
+ * $RCSfile  $
+ * $Revision  $
+ * $Date  $
+ *
+ * Copyright (C) 1999-2005 Jive Software. All rights reserved.
+ * This software is the proprietary information of Jive Software. Use is subject to license terms.
+ */
+package org.jivesoftware.smackx;
+
+import org.jivesoftware.smack.test.SmackTestCase;
+import org.jivesoftware.smack.XMPPException;
+import org.jivesoftware.smackx.filetransfer.*;
+
+import java.io.OutputStream;
+import java.io.InputStream;
+import java.io.IOException;
+import java.util.concurrent.SynchronousQueue;
+
+/**
+ *
+ */
+public class FileTransferTest extends SmackTestCase {
+
+    int receiveCount = -1;
+
+    Exception exception;
+
+    public FileTransferTest(String arg0) {
+        super(arg0);
+    }
+
+    public void testInbandFileTransfer() throws Exception {
+        FileTransferNegotiator.IBB_ONLY = true;
+        try {
+            testFileTransfer();
+        }
+        finally {
+            FileTransferNegotiator.IBB_ONLY = false;
+        }
+    }
+
+    public void testFileTransfer() throws Exception {
+        final byte [] testTransfer = "This is a test transfer".getBytes();
+        final SynchronousQueue<byte[]> queue = new SynchronousQueue<byte[]>();
+        FileTransferManager manager1 = new FileTransferManager(getConnection(0));
+        manager1.addFileTransferListener(new FileTransferListener() {
+            public void fileTransferRequest(final FileTransferRequest request) {
+                new Thread(new Runnable() {
+                    public void run() {
+                        IncomingFileTransfer transfer = request.accept();
+                        InputStream stream;
+                        try {
+                            stream = transfer.recieveFile();
+                        }
+                        catch (XMPPException e) {
+                            exception = e;
+                            return;
+                        }
+                        byte [] testRecieve = new byte[testTransfer.length];
+                        int receiveCount = 0;
+                        try {
+                            while (receiveCount != -1) {
+                                receiveCount = stream.read(testRecieve);
+                            }
+                        }
+                        catch (IOException e) {
+                            exception = e;
+                        }
+                        finally {
+                            try {
+                                stream.close();
+                            }
+                            catch (IOException e) {
+                                e.printStackTrace();
+                            }
+                        }
+                        try {
+                            queue.put(testRecieve);
+                        }
+                        catch (InterruptedException e) {
+                            exception = e;
+                        }
+                    }
+                }).start();
+            }
+        });
+
+        // Send the file from user1 to user0
+        FileTransferManager manager2 = new FileTransferManager(getConnection(1));
+        OutgoingFileTransfer outgoing = manager2.createOutgoingFileTransfer(getFullJID(0));
+
+        OutputStream stream =
+                outgoing.sendFile("test.txt", testTransfer.length, "The great work of robin hood");
+        stream.write(testTransfer);
+        stream.flush();
+        stream.close();
+
+        if(exception != null) {
+            exception.printStackTrace();
+            fail();
+        }
+        byte [] array = queue.take();
+        assertEquals("Recieved file not equal to sent file.", testTransfer, array);
+    }
+
+
+    protected int getMaxConnections() {
+        return 2;
+    }
+}