diff --git a/src/ImageSharp.Formats.Tiff/ImageSharp.Formats.Tiff.csproj b/src/ImageSharp.Formats.Tiff/ImageSharp.Formats.Tiff.csproj
index 23103c903b..2df493b7d8 100644
--- a/src/ImageSharp.Formats.Tiff/ImageSharp.Formats.Tiff.csproj
+++ b/src/ImageSharp.Formats.Tiff/ImageSharp.Formats.Tiff.csproj
@@ -2,6 +2,18 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard1.1</TargetFramework>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="System.Buffers" Version="4.0.0" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.0.0" />
+    <PackageReference Include="System.Numerics.Vectors" Version="4.1.1" />
+    <PackageReference Include="System.Threading.Tasks.Parallel" Version="4.0.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\ImageSharp\**\*.cs" Exclude="..\ImageSharp\obj\**\*.cs" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/ImageSharp.Formats.Tiff/TiffFormat.cs b/src/ImageSharp.Formats.Tiff/TiffFormat.cs
index 010c54f0a6..805eef87b3 100644
--- a/src/ImageSharp.Formats.Tiff/TiffFormat.cs
+++ b/src/ImageSharp.Formats.Tiff/TiffFormat.cs
@@ -10,7 +10,7 @@ namespace ImageSharp.Formats
     /// <summary>
     /// Encapsulates the means to encode and decode Tiff images.
     /// </summary>
-    public class TiffFormat //: IImageFormat
+    public class TiffFormat : IImageFormat
     {
         /// <inheritdoc/>
         public string MimeType => "image/tiff";
@@ -22,10 +22,10 @@ namespace ImageSharp.Formats
         public IEnumerable<string> SupportedExtensions => new string[] { "tif", "tiff" };
 
         /// <inheritdoc/>
-        //public IImageDecoder Decoder => new TiffDecoder();
+        public IImageDecoder Decoder => new TiffDecoder();
 
         /// <inheritdoc/>
-        //public IImageEncoder Encoder => throw new System.NotImplementedException();
+        public IImageEncoder Encoder => throw new System.NotImplementedException();
 
         /// <inheritdoc/>
         public int HeaderSize => 4;
diff --git a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffFormatTests.cs b/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffFormatTests.cs
index 313b9c950a..e0f8fd41b8 100644
--- a/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffFormatTests.cs
+++ b/tests/ImageSharp.Formats.Tiff.Tests/Formats/Tiff/TiffFormatTests.cs
@@ -15,6 +15,17 @@ namespace ImageSharp.Tests
         public static object[][] IsLittleEndianValues = new[] { new object[] { false },
                                                                 new object[] { true } };
 
+        [Fact]
+        public void FormatProperties_AreAsExpected()
+        {
+            TiffFormat tiffFormat = new TiffFormat();
+
+            Assert.Equal("image/tiff", tiffFormat.MimeType);
+            Assert.Equal("tif", tiffFormat.Extension);
+            Assert.Contains("tif", tiffFormat.SupportedExtensions);
+            Assert.Contains("tiff", tiffFormat.SupportedExtensions);
+        }
+
         [Theory]
         [MemberData(nameof(IsLittleEndianValues))]
         public void IsSupportedFileFormat_ReturnsTrue_ForValidFile(bool isLittleEndian)
@@ -84,5 +95,16 @@ namespace ImageSharp.Tests
 
             Assert.False(isSupported);
         }
+
+        [Fact]
+        public void Decoder_ReturnsTiffDecoder()
+        {
+            TiffFormat tiffFormat = new TiffFormat();
+
+            var decoder = tiffFormat.Decoder;
+
+            Assert.NotNull(decoder);
+            Assert.IsType<TiffDecoder>(decoder);
+        }
     }
 }