diff --git a/Tests/test_imagefontctl.py b/Tests/test_imagefontctl.py
index 32999b169..d8c4df888 100644
--- a/Tests/test_imagefontctl.py
+++ b/Tests/test_imagefontctl.py
@@ -1,139 +1,129 @@
 # -*- coding: utf-8 -*-
 from helper import unittest, PillowTestCase
-from PIL import Image
-from PIL import ImageDraw, ImageFont
+from PIL import Image, ImageDraw, ImageFont, features
 
-#check if raqm installed
-have_raqm = ImageFont.core.have_raqm
 
 FONT_SIZE = 20
 FONT_PATH = "Tests/fonts/DejaVuSans.ttf"
 
-try:
-    from PIL import ImageFont
+@unittest.skipUnless(features.check('raqm'), "Raqm Library is not installed.")
+class TestImagecomplextext(PillowTestCase):
+
+    def test_english(self):
+        #smoke test, this should not fail
+        ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
+        im = Image.new(mode='RGB', size=(300, 100))
+        draw = ImageDraw.Draw(im)
+        draw.text((0, 0), 'TEST', font=ttf, fill=500, direction='ltr')
+        
     
-    ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
-    im = Image.new(mode='RGB', size=(300, 100))
-    draw = ImageDraw.Draw(im)
-    draw.text((0, 0), 'TEST', font=ttf, fill=500, direction='ltr')
-    @unittest.skipIf(not have_raqm, "Raqm Library is not installed !")
-    class TestImagecomplextext(PillowTestCase):
-        def test_complex_text(self):
-            ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
+    def test_complex_text(self):
+        ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
 
-            im = Image.new(mode='RGB', size=(300, 100))
-            draw = ImageDraw.Draw(im)
-            draw.text((0, 0), 'اهلا عمان', font=ttf, fill=500)
+        im = Image.new(mode='RGB', size=(300, 100))
+        draw = ImageDraw.Draw(im)
+        draw.text((0, 0), 'اهلا عمان', font=ttf, fill=500)
 
-            target = 'Tests/images/test_text.png'
-            target_img = Image.open(target)
+        target = 'Tests/images/test_text.png'
+        target_img = Image.open(target)
 
-            self.assert_image_similar(im, target_img, .5)
+        self.assert_image_similar(im, target_img, .5)
 
-        def test_y_offset(self):
-            ttf = ImageFont.truetype("Tests/fonts/NotoNastaliqUrdu-Regular.ttf", FONT_SIZE)
+    def test_y_offset(self):
+        ttf = ImageFont.truetype("Tests/fonts/NotoNastaliqUrdu-Regular.ttf", FONT_SIZE)
 
-            im = Image.new(mode='RGB', size=(300, 100))
-            draw = ImageDraw.Draw(im)
-            draw.text((0, 0), 'العالم العربي', font=ttf, fill=500)
+        im = Image.new(mode='RGB', size=(300, 100))
+        draw = ImageDraw.Draw(im)
+        draw.text((0, 0), 'العالم العربي', font=ttf, fill=500)
 
-            target = 'Tests/images/test_y_offset.png'
-            target_img = Image.open(target)
+        target = 'Tests/images/test_y_offset.png'
+        target_img = Image.open(target)
 
-            self.assert_image_similar(im, target_img, .5)
+        self.assert_image_similar(im, target_img, .5)
 
-        def test_complex_unicode_text(self):
-            ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
+    def test_complex_unicode_text(self):
+        ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
 
-            im = Image.new(mode='RGB', size=(300, 100))
-            draw = ImageDraw.Draw(im)
-            draw.text((0, 0), u'السلام عليكم', font=ttf, fill=500)
+        im = Image.new(mode='RGB', size=(300, 100))
+        draw = ImageDraw.Draw(im)
+        draw.text((0, 0), u'السلام عليكم', font=ttf, fill=500)
 
-            target = 'Tests/images/test_complex_unicode_text.png'
-            target_img = Image.open(target)
+        target = 'Tests/images/test_complex_unicode_text.png'
+        target_img = Image.open(target)
 
-            self.assert_image_similar(im, target_img, .5)
+        self.assert_image_similar(im, target_img, .5)
 
-        def test_text_direction_rtl(self):
-            ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
+    def test_text_direction_rtl(self):
+        ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
 
-            im = Image.new(mode='RGB', size=(300, 100))
-            draw = ImageDraw.Draw(im)
-            draw.text((0, 0), 'English عربي', font=ttf, fill=500, direction='rtl')
+        im = Image.new(mode='RGB', size=(300, 100))
+        draw = ImageDraw.Draw(im)
+        draw.text((0, 0), 'English عربي', font=ttf, fill=500, direction='rtl')
 
-            target = 'Tests/images/test_direction_rtl.png'
-            target_img = Image.open(target)
+        target = 'Tests/images/test_direction_rtl.png'
+        target_img = Image.open(target)
 
-            self.assert_image_similar(im, target_img, .5)
+        self.assert_image_similar(im, target_img, .5)
 
-        def test_text_direction_ltr(self):
-            ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
+    def test_text_direction_ltr(self):
+        ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
 
-            im = Image.new(mode='RGB', size=(300, 100))
-            draw = ImageDraw.Draw(im)
-            draw.text((0, 0),  'سلطنة عمان Oman', font=ttf, fill=500, direction='ltr')
+        im = Image.new(mode='RGB', size=(300, 100))
+        draw = ImageDraw.Draw(im)
+        draw.text((0, 0),  'سلطنة عمان Oman', font=ttf, fill=500, direction='ltr')
 
-            target = 'Tests/images/test_direction_ltr.png'
-            target_img = Image.open(target)
+        target = 'Tests/images/test_direction_ltr.png'
+        target_img = Image.open(target)
 
-            self.assert_image_similar(im, target_img, .5)
+        self.assert_image_similar(im, target_img, .5)
 
-        def test_text_direction_rtl2(self):
-            ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
+    def test_text_direction_rtl2(self):
+        ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
 
-            im = Image.new(mode='RGB', size=(300, 100))
-            draw = ImageDraw.Draw(im)
-            draw.text((0, 0), 'Oman سلطنة عمان', font=ttf, fill=500, direction='rtl')
+        im = Image.new(mode='RGB', size=(300, 100))
+        draw = ImageDraw.Draw(im)
+        draw.text((0, 0), 'Oman سلطنة عمان', font=ttf, fill=500, direction='rtl')
 
-            target = 'Tests/images/test_direction_ltr.png'
-            target_img = Image.open(target)
+        target = 'Tests/images/test_direction_ltr.png'
+        target_img = Image.open(target)
 
-            self.assert_image_similar(im, target_img, .5)
+        self.assert_image_similar(im, target_img, .5)
 
-        def test_ligature_features(self):
-            ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
+    def test_ligature_features(self):
+        ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
 
-            im = Image.new(mode='RGB', size=(300, 100))
-            draw = ImageDraw.Draw(im)
-            draw.text((0, 0), 'filling', font=ttf, fill=500, features=['-liga'])
+        im = Image.new(mode='RGB', size=(300, 100))
+        draw = ImageDraw.Draw(im)
+        draw.text((0, 0), 'filling', font=ttf, fill=500, features=['-liga'])
 
-            target = 'Tests/images/test_ligature_features.png'
-            target_img = Image.open(target)
+        target = 'Tests/images/test_ligature_features.png'
+        target_img = Image.open(target)
 
-            self.assert_image_similar(im, target_img, .5)
+        self.assert_image_similar(im, target_img, .5)
 
-        def test_kerning_features(self):
-            ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
+    def test_kerning_features(self):
+        ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
 
-            im = Image.new(mode='RGB', size=(300, 100))
-            draw = ImageDraw.Draw(im)
-            draw.text((0, 0), 'TeToAV', font=ttf, fill=500, features=['-kern'])
+        im = Image.new(mode='RGB', size=(300, 100))
+        draw = ImageDraw.Draw(im)
+        draw.text((0, 0), 'TeToAV', font=ttf, fill=500, features=['-kern'])
 
-            target = 'Tests/images/test_kerning_features.png'
-            target_img = Image.open(target)
+        target = 'Tests/images/test_kerning_features.png'
+        target_img = Image.open(target)
 
-            self.assert_image_similar(im, target_img, .5)
+        self.assert_image_similar(im, target_img, .5)
 
-        def test_arabictext_features(self):
-            ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
+    def test_arabictext_features(self):
+        ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
 
-            im = Image.new(mode='RGB', size=(300, 100))
-            draw = ImageDraw.Draw(im)
-            draw.text((0, 0), 'اللغة العربية', font=ttf, fill=500, features=['-fina','-init','-medi'])
+        im = Image.new(mode='RGB', size=(300, 100))
+        draw = ImageDraw.Draw(im)
+        draw.text((0, 0), 'اللغة العربية', font=ttf, fill=500, features=['-fina','-init','-medi'])
 
-            target = 'Tests/images/test_arabictext_features.png'
-            target_img = Image.open(target)
+        target = 'Tests/images/test_arabictext_features.png'
+        target_img = Image.open(target)
 
-            self.assert_image_similar(im, target_img, .5)
-
-except ImportError:
-    class TestImagecomplextext(PillowTestCase):
-        def test_skip(self):
-            self.skipTest("ImportError")
-except KeyError:
-    class TestImagecomplextext(PillowTestCase):
-        def test_skip(self):
-            self.skipTest("KeyError")
+        self.assert_image_similar(im, target_img, .5)
 
 if __name__ == '__main__':
     unittest.main()