diff --git a/src/tools/stlport.jam b/src/tools/stlport.jam
index 3e3c89bbb..41df760e0 100644
--- a/src/tools/stlport.jam
+++ b/src/tools/stlport.jam
@@ -83,6 +83,20 @@ rule stlport-target-class ( project : headers ? : libraries ? : requirements * )
     self.libraries = $(libraries) ;
     
     import feature project type errors generators ;
+    import set : difference ;
+    
+    rule generate ( property-set )
+    {
+        # Since this target is built with <stdlib>stlport, it will also
+        # have <library>/stlport//stlport in requirements, which will
+        # cause a loop in main target references. Remove that property
+        # manually.
+        
+        property-set = [ property-set.create [ difference
+            [ $(property-set).raw ] : <library>/stlport//stlport ] ] ;
+        return [ basic-target.generate $(property-set) ] ;
+    }
+    
     
     rule construct ( source-targets * : property-set )
     {
diff --git a/test/test_all.py b/test/test_all.py
index 078e26804..71aab124b 100644
--- a/test/test_all.py
+++ b/test/test_all.py
@@ -106,9 +106,9 @@ tests = [ "project_test1",
 if os.name == 'posix':
     tests.append("symlink")
 
-#if 'QTDIR' in os.environ:
-#    tests.append("railsys")
-#else:
-#    print 'skipping railsys test since QTDIR environment variable is unset'
+if 'QTDIR' in os.environ:
+    tests.append("railsys")
+else:
+    print 'skipping railsys test since QTDIR environment variable is unset'
 
 run_tests(critical_tests, tests)