diff --git a/python-stomper-uuid.patch b/python-stomper-uuid.patch
new file mode 100644
index 0000000..7afb3e7
--- /dev/null
+++ b/python-stomper-uuid.patch
@@ -0,0 +1,10 @@
+--- setup.py.orig	2009-06-02 13:24:33.000000000 -0400
++++ setup.py	2009-06-02 13:24:44.000000000 -0400
+@@ -46,7 +46,6 @@
+ 
+ 
+ needed = [
+-    'uuid>=1.2',
+ ]
+ 
+ setup(
diff --git a/python-stomper.spec b/python-stomper.spec
index b7ce179..72f10cb 100644
--- a/python-stomper.spec
+++ b/python-stomper.spec
@@ -2,18 +2,25 @@
 
 Name:           python-stomper
 Version:        0.2.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        A python client implementation of the STOMP protocol
 
 Group:          Development/Languages
 License:        ASL 2.0
 URL:            http://code.google.com/p/stomper/
 Source0:        http://stomper.googlecode.com/files/stomper-%{version}.tar.gz
+Patch0:         %{name}-uuid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
+BuildRequires:  python-nose
+
+%if 0%{?el5}
+BuildRequires:  python-uuid
+Requires:       python-uuid
+%endif
 
 %description
 This is a python client implementation of the STOMP protocol. The client is
@@ -22,6 +29,7 @@ create and parse STOMP messages in a programatic fashion.
 
 %prep
 %setup -q -n stomper-%{version}
+%patch0 -p0 -b .uuid
 
 %build
 %{__python} setup.py build
@@ -32,6 +40,9 @@ rm -rf $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT%{python_sitelib}/stomper/examples
 rm -rf $RPM_BUILD_ROOT%{python_sitelib}/stomper/tests
 
+%check
+PYTHONPATH=$(pwd) nosetests
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -41,6 +52,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*
 
 %changelog
+* Thu Sep 03 2009 Luke Macken <lmacken@redhat.com> - 0.2.2-9
+- Require python-uuid when using Python2.4 only
+- Run the test suite in %%check
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild