diff --git a/SabreTools.DatFiles.Test/ItemDictionaryDBTests.cs b/SabreTools.DatFiles.Test/ItemDictionaryDBTests.cs
index c92b1f17..71940945 100644
--- a/SabreTools.DatFiles.Test/ItemDictionaryDBTests.cs
+++ b/SabreTools.DatFiles.Test/ItemDictionaryDBTests.cs
@@ -213,13 +213,17 @@ namespace SabreTools.DatFiles.Test
 
         #region RemoveMachine
 
-        // TODO: Add RemoveMachine tests
+        [Fact]
+        public void RemoveMachineTest()
+        {
+            Machine machine = new Machine();
+            var dict = new ItemDictionaryDB();
+            long machineIndex = dict.AddMachine(machine);
 
-        #endregion
-
-        #region SetBucketedBy
-
-        // TODO: Add SetBucketedBy tests
+            bool actual = dict.RemoveMachine(machineIndex);
+            Assert.True(actual);
+            Assert.Empty(dict.GetMachines());
+        }
 
         #endregion
 
diff --git a/SabreTools.DatFiles.Test/ItemDictionaryTests.cs b/SabreTools.DatFiles.Test/ItemDictionaryTests.cs
index 5b8a443c..cabb2809 100644
--- a/SabreTools.DatFiles.Test/ItemDictionaryTests.cs
+++ b/SabreTools.DatFiles.Test/ItemDictionaryTests.cs
@@ -73,6 +73,12 @@ namespace SabreTools.DatFiles.Test
 
         #endregion
 
+        #region SetBucketedBy
+
+        // TODO: Add SetBucketedBy tests
+
+        #endregion
+
         #region BucketBy
 
         [Theory]