diff --git a/lib/private/Preview/HEIC.php b/lib/private/Preview/HEIC.php
index 9057596847..151326129b 100644
--- a/lib/private/Preview/HEIC.php
+++ b/lib/private/Preview/HEIC.php
@@ -29,4 +29,12 @@ class HEIC extends Bitmap {
 	public function getMimeType() {
 		return '/image\/hei(f|c)/';
 	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function isAvailable(\OCP\Files\FileInfo $file) {
+		return in_array("HEIC", \Imagick::queryFonts("HEI*") );
+	}
+
 }
diff --git a/tests/lib/Preview/HEICTest.php b/tests/lib/Preview/HEICTest.php
index 324d068395..63b9038d35 100644
--- a/tests/lib/Preview/HEICTest.php
+++ b/tests/lib/Preview/HEICTest.php
@@ -31,12 +31,18 @@ namespace Test\Preview;
 class HEICTest extends Provider {
 
 	public function setUp() {
-		parent::setUp();
+		if ( !in_array("HEIC", \Imagick::queryFormats("HEI*")) ) {
+			$this->markTestSkipped('ImageMagick is not HEIC aware. Skipping tests');
+		} else {
+			parent::setUp();
+
+			$fileName = 'testimage.heic';
+			$this->imgPath = $this->prepareTestFile($fileName, \OC::$SERVERROOT . '/tests/data/' . $fileName);
+			$this->width = 1680;
+			$this->height = 1050;
+			$this->provider = new \OC\Preview\HEIC;
+		}
 
-		$fileName = 'testimage.heic';
-		$this->imgPath = $this->prepareTestFile($fileName, \OC::$SERVERROOT . '/tests/data/' . $fileName);
-		$this->width = 1680;
-		$this->height = 1050;
-		$this->provider = new \OC\Preview\HEIC;
 	}
+
 }
\ No newline at end of file