diff --git a/test.el b/test.el
new file mode 100755
index 0000000..b53260a
--- /dev/null
+++ b/test.el
@@ -0,0 +1,26 @@
+#!/bin/sh
+":"; exec emacs -Q --script "$0" -- "$@"
+
+(setq cwd default-directory)
+
+(defun stomp-message-buffer (test-file)
+  "Create a buffer with a stomp message in it for testing purposes"
+  (find-file (format "%s/testdata/%s" cwd test-file)))
+
+(defun simple-message-buffer ()
+  "Simple buffer to be used for testing"
+  (stomp-message-buffer "stomp_message.txt"))
+
+(defun carriage-return-message-buffer ()
+  "Simple buffer with carriage returns"
+  (stomp-message-buffer "stomp_message_cr.txt"))
+
+(load (format "%sstomp.el" default-directory) nil t)
+
+;; Simple test for basic buffer
+(pp (stomp-read-message (simple-message-buffer)))
+
+;; Test for buffer containing carriage returns
+(pp (stomp-read-message (carriage-return-message-buffer)))
+
+
diff --git a/testdata/stomp_message.txt b/testdata/stomp_message.txt
new file mode 100644
index 0000000..b7dc5f8
Binary files /dev/null and b/testdata/stomp_message.txt differ
diff --git a/testdata/stomp_message_cr.txt b/testdata/stomp_message_cr.txt
new file mode 100644
index 0000000..e1a94c5
Binary files /dev/null and b/testdata/stomp_message_cr.txt differ