diff --git a/test.sh b/test.sh
index cc4f0aa2..1e071c5b 100755
--- a/test.sh
+++ b/test.sh
@@ -17,7 +17,7 @@ for i in $TESTPATH/test.*.py; do
 done
 
 echo "Check that rpmlint executes with no unexpected errors"
-python ./rpmlint -C $(pwd) test/*.rpm test/*.spec >/dev/null
+python ./rpmlint -C $(pwd) test/*/*.rpm test/spec/*.spec >/dev/null
 rc=$?
 test $rc -eq 0 -o $rc -eq 64
 
diff --git a/test/SpecCheck.spec b/test/SpecCheck.spec
deleted file mode 100644
index 2958bc6e..00000000
--- a/test/SpecCheck.spec
+++ /dev/null
@@ -1,62 +0,0 @@
-Name:           SpecCheck
-Version:        0
-Release:        0
-Summary:        None here
-
-Group:          Undefined
-License:        GPLv2
-URL:            http://rpmlint.zarb.org/#%{name}
-Source0:        Source0.tar.gz
-Patch:          Patch.patch
-Patch1:         Patch1.patch
-Patch2:         Patch2.patch
-Patch3:         Patch3.patch
-Patch4:         Patch4.patch
-Patch5:         Patch5.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Provides:       unversioned-provides, versioned-provides = 1.0
-Obsoletes:      versioned-obsoletes < 2.0
-Obsoletes:      unversioned-obsoletes
-
-%description
-SpecCheck test.
-
-%package        noarch-sub
-Summary:        Noarch subpackage
-Group:          Undefined
-BuildArch:      noarch
-
-%description    noarch-sub
-Noarch subpackage test.
-
-
-%prep
-%setup
-%patch1
-%patch
-%patch -P 2 -P 4
-sed -e s/foo/bar/ %{PATCH5} | %{__patch} -p1
-
-
-%build
-# %configure
-# %%%
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%files
-%defattr(-,root,root,-)
-%{_libdir}/foo
-
-%files noarch-sub
-%defattr(-,root,root,-)
-
-
-%changelog
diff --git a/test/PamCheck-0.1-1.i586.rpm b/test/binary/PamCheck-0.1-1.i586.rpm
similarity index 100%
rename from test/PamCheck-0.1-1.i586.rpm
rename to test/binary/PamCheck-0.1-1.i586.rpm
diff --git a/test/SpecCheck2.spec b/test/spec/SpecCheck2.spec
similarity index 100%
rename from test/SpecCheck2.spec
rename to test/spec/SpecCheck2.spec
diff --git a/test/SpecCheck3.spec b/test/spec/SpecCheck3.spec
similarity index 100%
rename from test/SpecCheck3.spec
rename to test/spec/SpecCheck3.spec
diff --git a/test/test.PamCheck.py b/test/test.PamCheck.py
index 2a74a336..25df4794 100644
--- a/test/test.PamCheck.py
+++ b/test/test.PamCheck.py
@@ -9,7 +9,7 @@ import PamCheck
 class TestPamCheck(unittest.TestCase):
 
     def setUp(self):
-        self.pkg = Testing.getTestedPackage('PamCheck')
+        self.pkg = Testing.getTestedPackage('binary/PamCheck')
         Testing.startTest()
 
     def tearDown(self):
diff --git a/test/test.SpecCheck.py b/test/test.SpecCheck.py
index 6748cc1d..f0e586d9 100644
--- a/test/test.SpecCheck.py
+++ b/test/test.SpecCheck.py
@@ -10,7 +10,7 @@ import SpecCheck
 class TestSpecCheck(unittest.TestCase):
 
     def setUp(self):
-        self.pkg = Testing.getTestedSpecPackage('SpecCheck')
+        self.pkg = Testing.getTestedSpecPackage('spec/SpecCheck')
         Testing.startTest()
 
     def testcheck(self):
diff --git a/test/test.SpecCheck2.py b/test/test.SpecCheck2.py
index 8e0c68e0..4b9123f8 100644
--- a/test/test.SpecCheck2.py
+++ b/test/test.SpecCheck2.py
@@ -9,7 +9,7 @@ import SpecCheck
 class TestSpecCheck(unittest.TestCase):
 
     def setUp(self):
-        self.pkg = Testing.getTestedSpecPackage('SpecCheck2')
+        self.pkg = Testing.getTestedSpecPackage('spec/SpecCheck2')
         Testing.startTest()
 
     def testcheck(self):
diff --git a/test/test.SpecCheck3.py b/test/test.SpecCheck3.py
index eab38497..98a98b38 100644
--- a/test/test.SpecCheck3.py
+++ b/test/test.SpecCheck3.py
@@ -9,7 +9,7 @@ import SpecCheck
 class TestSpecCheck(unittest.TestCase):
 
     def setUp(self):
-        self.pkg = Testing.getTestedSpecPackage('SpecCheck3')
+        self.pkg = Testing.getTestedSpecPackage('spec/SpecCheck3')
         Testing.startTest()
 
     def testcheck(self):