diff --git a/src/Orchard.Core.Tests/Common/BbcodeFilterTests.cs b/src/Orchard.Core.Tests/Common/BbcodeFilterTests.cs
new file mode 100644
index 000000000..cd5b3dac8
--- /dev/null
+++ b/src/Orchard.Core.Tests/Common/BbcodeFilterTests.cs
@@ -0,0 +1,38 @@
+using NUnit.Framework;
+using Orchard.Core.Common.Services;
+
+namespace Orchard.Core.Tests.Common {
+    [TestFixture]
+    public class BbcodeFilterTests {
+
+        private readonly BbcodeFilter _filter = new BbcodeFilter();
+
+        [Test]
+        public void ShouldIgnoreText() {
+            const string text = "foo bar baz";
+            var processed = _filter.ProcessContent(text, null);
+            Assert.That(processed, Is.EqualTo(text));
+        }
+
+        [Test]
+        public void ShouldReplaceUrl() {
+            const string text = "foo [url]bar[/url] baz";
+            var processed = _filter.ProcessContent(text, null);
+            Assert.That(processed, Is.EqualTo("foo <a href=\"bar\">bar</a> baz"));
+        }
+
+        [Test]
+        public void ShouldReplaceImg() {
+            const string text = "foo [img]bar[/img] baz";
+            var processed = _filter.ProcessContent(text, null);
+            Assert.That(processed, Is.EqualTo("foo <img src=\"bar\">bar</img> baz"));
+        }
+
+        [Test]
+        public void ShouldReplaceUrlWithTitle() {
+            const string text = "foo [url=alink]bar[/url] baz";
+            var processed = _filter.ProcessContent(text, null);
+            Assert.That(processed, Is.EqualTo("foo <a href=\"alink\">bar</a> baz"));
+        }
+    }
+}
\ No newline at end of file