diff --git a/Makefile.am b/Makefile.am
index 9e55bb0..35612f6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -155,6 +155,7 @@ tocktest_SOURCES += frontends/ParseRainTest.hs
 tocktest_SOURCES += frontends/PreprocessOccamTest.hs
 tocktest_SOURCES += frontends/RainPassesTest.hs
 tocktest_SOURCES += frontends/RainTypesTest.hs
+tocktest_SOURCES += frontends/StructureOccamTest.hs
 tocktest_SOURCES += transformations/PassTest.hs
 
 GenTagAST_SOURCES = GenTagAST.hs
diff --git a/TestMain.hs b/TestMain.hs
index 00d4b30..5fe35d8 100644
--- a/TestMain.hs
+++ b/TestMain.hs
@@ -56,6 +56,7 @@ import qualified PassTest (tests)
 import qualified PreprocessOccamTest (tests)
 import qualified RainPassesTest (tests)
 import qualified RainTypesTest (tests)
+import qualified StructureOccamTest (tests)
 import qualified UsageCheckTest (tests)
 import TestUtils
 import Utils
@@ -153,6 +154,7 @@ main = do (opts, nonOpts, errs) <- getArgs >>* getOpt RequireOrder options
               ,noqc PreprocessOccamTest.tests
               ,noqc RainPassesTest.tests
               ,noqc RainTypesTest.tests
+              ,noqc StructureOccamTest.tests
               ,noqc UsageCheckTest.tests
             ]
 
diff --git a/frontends/StructureOccamTest.hs b/frontends/StructureOccamTest.hs
new file mode 100644
index 0000000..5e7f9f2
--- /dev/null
+++ b/frontends/StructureOccamTest.hs
@@ -0,0 +1,70 @@
+{-
+Tock: a compiler for parallel languages
+Copyright (C) 2008  Adam Sampson <ats@offog.org>
+
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation, either version 2 of the License, or (at your
+option) any later version.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License along
+with this program.  If not, see <http://www.gnu.org/licenses/>.
+-}
+
+-- | Tests for the occam structure analyser.
+module StructureOccamTest (tests) where
+
+import Test.HUnit
+
+import LexOccam
+import Metadata
+import Pattern
+import StructureOccam
+import TestUtils
+import TreeUtils
+
+-- | Test 'structureOccam' when we're expecting it to succeed.
+testS :: Int -> [Token] -> [Pattern] -> Test
+testS n its etts = TestCase $ testPass ("testS " ++ show n) ets (structureOccam its) (return ())
+  where
+    ets = zip (repeat DontCare) etts
+
+-- | Test 'structureOccam' when we're expecting it to fail.
+testSFail :: Int -> [Token] -> Test
+testSFail n its = TestCase $ testPassShouldFail ("testSFail " ++ show n) (structureOccam its) (return ())
+
+--{{{  0xxx  simple stuff
+testSimple :: Test
+testSimple = TestLabel "testSimple" $ TestList
+  -- Basic structuring
+  [ testS       0 [] []
+  , testS      10 [(m 1 1, foo), (m 2 1, foo)] [fooP, eolP, fooP, eolP]
+  , testS      20 [(m 1 1, foo), (m 2 3, foo)] [fooP, eolP, inP, fooP, eolP, outP]
+  , testS      30 [(m 1 1, foo), (m 2 3, foo), (m 3 1, foo)] [fooP, eolP, inP, fooP, eolP, outP, fooP, eolP]
+  , testS      40 [(m 1 1, foo), (m 2 3, foo), (m 3 5, foo), (m 4 1, foo)]
+                  [fooP, eolP, inP, fooP, eolP, inP, fooP, eolP, outP, outP, fooP, eolP]
+  , testS      50 [(m 1 1, foo), (m 2 3, foo), (m 3 3, foo), (m 4 3, foo)]
+                  [fooP, eolP, inP, fooP, eolP, fooP, eolP, fooP, eolP, outP]
+
+  -- Things that should fail
+  , testSFail  900 [(m 1 1, foo), (m 2 2, foo)]
+  , testSFail  910 [(m 1 1, foo), (m 2 5, foo)]
+  ]
+  where
+    foo = TokIdentifier "foo"
+    fooP = tag1 TokIdentifier "foo"
+    eolP = tag0 EndOfLine
+    inP = tag0 Indent
+    outP = tag0 Outdent
+    m l c = emptyMeta { metaFile = Just "simulated.occ", metaLine = l, metaColumn = c }
+--}}}
+
+tests :: Test
+tests = TestLabel "StructureOccamTest" $ TestList
+  [ testSimple
+  ]