diff --git a/UnitTest/Bootstrap.Admin/Api/MessagesTest.cs b/UnitTest/Bootstrap.Admin/Api/MessagesTest.cs
new file mode 100644
index 00000000..028533a8
--- /dev/null
+++ b/UnitTest/Bootstrap.Admin/Api/MessagesTest.cs
@@ -0,0 +1,33 @@
+using Bootstrap.Admin.Models;
+using Bootstrap.DataAccess;
+using System.Collections.Generic;
+using Xunit;
+
+namespace Bootstrap.Admin.Api
+{
+    public class MessagesTest : ApiTest
+    {
+        public MessagesTest(BAWebHost factory) : base(factory, "Messages", true)
+        {
+
+        }
+
+        [Theory]
+        [InlineData("inbox")]
+        [InlineData("sendmail")]
+        [InlineData("mark")]
+        [InlineData("trash")]
+        public async void Get_Ok(string action)
+        {
+            var resp = await Client.GetAsJsonAsync<IEnumerable<Message>>(action);
+            Assert.NotNull(resp);
+        }
+
+        [Fact]
+        public async void GetCount_Ok()
+        {
+            var resp = await Client.GetAsJsonAsync<MessageCountModel>(string.Empty);
+            Assert.NotNull(resp);
+        }
+    }
+}