diff --git a/src/Umbraco.Core/Services/IMacroService.cs b/src/Umbraco.Core/Services/IMacroService.cs
index 0c59b8a614..809f87dccf 100644
--- a/src/Umbraco.Core/Services/IMacroService.cs
+++ b/src/Umbraco.Core/Services/IMacroService.cs
@@ -22,6 +22,10 @@ namespace Umbraco.Core.Services
         /// <returns>An enumerable list of <see cref="IMacro"/> objects</returns>
         IEnumerable<IMacro> GetAll(params string[] aliases);
 
+        IEnumerable<IMacro> GetAll(params int[] ids);
+
+        IMacro GetById(int id);
+
         /// <summary>
         /// Deletes an <see cref="IMacro"/>
         /// </summary>
diff --git a/src/Umbraco.Core/Services/MacroService.cs b/src/Umbraco.Core/Services/MacroService.cs
index a620bbc0ab..837e0d31de 100644
--- a/src/Umbraco.Core/Services/MacroService.cs
+++ b/src/Umbraco.Core/Services/MacroService.cs
@@ -6,6 +6,7 @@ using Umbraco.Core.Events;
 using Umbraco.Core.Models;
 using Umbraco.Core.Persistence;
 using Umbraco.Core.Persistence.Querying;
+using Umbraco.Core.Persistence.Repositories;
 using Umbraco.Core.Persistence.UnitOfWork;
 
 namespace Umbraco.Core.Services
@@ -61,19 +62,39 @@ namespace Umbraco.Core.Services
             {
                 if (aliases.Any())
                 {
-                    var q = new Query<IMacro>();
-                    foreach (var alias in aliases)
-                    {
-                        q.Where(macro => macro.Alias == alias);
-                    }
-
-                    return repository.GetByQuery(q);
+                    return GetAllByAliases(repository, aliases);
                 }
 
                 return repository.GetAll();
             }
         }
 
+        public IEnumerable<IMacro> GetAll(params int[] ids)
+        {
+            using (var repository = _repositoryFactory.CreateMacroRepository(_uowProvider.GetUnitOfWork()))
+            {
+                return repository.GetAll(ids);
+            }
+        }
+
+        public IMacro GetById(int id)
+        {
+            using (var repository = _repositoryFactory.CreateMacroRepository(_uowProvider.GetUnitOfWork()))
+            {
+                return repository.Get(id);
+            }
+        }
+
+        private IEnumerable<IMacro> GetAllByAliases(IMacroRepository repo, IEnumerable<string> aliases)
+        {
+            foreach (var alias in aliases)
+            {
+                var q = new Query<IMacro>();
+                q.Where(macro => macro.Alias == alias);
+                yield return repo.GetByQuery(q).FirstOrDefault();
+            }
+        }
+
         /// <summary>
         /// Deletes an <see cref="IMacro"/>
         /// </summary>
diff --git a/src/Umbraco.Tests/Services/RepositoryServiceTests.cs b/src/Umbraco.Tests/Services/MacroServiceTests.cs
similarity index 96%
rename from src/Umbraco.Tests/Services/RepositoryServiceTests.cs
rename to src/Umbraco.Tests/Services/MacroServiceTests.cs
index 851dcd2d8d..44bf9a7583 100644
--- a/src/Umbraco.Tests/Services/RepositoryServiceTests.cs
+++ b/src/Umbraco.Tests/Services/MacroServiceTests.cs
@@ -7,14 +7,12 @@ using Umbraco.Core.Persistence.UnitOfWork;
 namespace Umbraco.Tests.Services
 {
     [TestFixture, RequiresSTA]
-    public class RepositoryServiceTests : BaseServiceTest
+    public class MacroServiceTests : BaseServiceTest
     {
         [SetUp]
         public override void Initialize()
         {
             base.Initialize();
-
-            CreateTestData();
         }
 
         public override void CreateTestData()
diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj
index 96eedad79d..1fc37d4dc2 100644
--- a/src/Umbraco.Tests/Umbraco.Tests.csproj
+++ b/src/Umbraco.Tests/Umbraco.Tests.csproj
@@ -264,7 +264,7 @@
     <Compile Include="Services\PackagingServiceTests.cs" />
     <Compile Include="Services\PerformanceTests.cs" />
     <Compile Include="Services\PreValueConverterTests.cs" />
-    <Compile Include="Services\RepositoryServiceTests.cs" />
+    <Compile Include="Services\MacroServiceTests.cs" />
     <Compile Include="Services\UserServiceTests.cs" />
     <Compile Include="Manifest\ManifestParserTests.cs" />
     <Compile Include="TestHelpers\BaseSeleniumTest.cs" />