diff --git a/haskell-utils.el b/haskell-utils.el
index 21c6728b2..fbf809426 100644
--- a/haskell-utils.el
+++ b/haskell-utils.el
@@ -62,11 +62,11 @@ Note: doesn't detect if in {--}-style comment."
   (save-excursion
     (goto-char (line-beginning-position))
     (if (looking-at (concat "[\t ]*import[\t ]+"
-                            "\\(safe[\t ]+\\)?" ;; SafeHaskell
-                            "\\(qualified[\t ]+\\)?"
-                            "\\(\"[^\"]*\"[\t ]+\\)?" ;; PackageImports
-                            "\\([[:digit:][:upper:][:lower:].]+\\)"))
-        (match-string-no-properties 4))))
+                            "\\(?:safe[\t ]+\\)?" ;; SafeHaskell
+                            "\\(?:qualified[\t ]+\\)?"
+                            "\\(?:\"[^\"]*\"[\t ]+\\)?" ;; PackageImports
+                            "\\([[:digit:][:upper:][:lower:]_.]+\\)"))
+        (match-string-no-properties 1))))
 
 
 (provide 'haskell-utils)
diff --git a/tests/haskell-utils-tests.el b/tests/haskell-utils-tests.el
new file mode 100644
index 000000000..faad5ea70
--- /dev/null
+++ b/tests/haskell-utils-tests.el
@@ -0,0 +1,102 @@
+(require 'ert)
+(require 'haskell-utils)
+
+(defun insert-lines (&rest lines)
+  (dolist (line lines)
+    (insert (concat line "\n"))))
+
+(ert-deftest simple-import-parse ()
+  (should (equal "A.B.C"
+		 (with-temp-buffer
+		   (insert-lines "import A.B.C")
+		   (goto-char (point-min))
+		   (forward-line 0)
+		   (haskell-utils-parse-import-statement-at-point)))))
+
+(ert-deftest qualified-import-parse ()
+  (should (equal "A.B.C"
+		 (with-temp-buffer
+		   (insert-lines "import qualified A.B.C")
+		   (goto-char (point-min))
+		   (forward-line 0)
+		   (haskell-utils-parse-import-statement-at-point)))))
+
+(ert-deftest qualified-as-import-parse ()
+  (should (equal "AAA.Bc.Cx"
+		 (with-temp-buffer
+		   (insert-lines "import qualified AAA.Bc.Cx as Something")
+		   (goto-char (point-min))
+		   (forward-line 0)
+		   (haskell-utils-parse-import-statement-at-point)))))
+
+(ert-deftest international-characters-import-parse ()
+  (should (equal "Żółć"
+		 (with-temp-buffer
+		   (insert-lines "import Żółć")
+		   (goto-char (point-min))
+		   (forward-line 0)
+		   (haskell-utils-parse-import-statement-at-point)))))
+
+(ert-deftest commented-out-import-parse ()
+  (should (equal nil
+		 (with-temp-buffer
+		   (insert-lines "-- import Nothing")
+		   (goto-char (point-min))
+		   (forward-line 0)
+		   (haskell-utils-parse-import-statement-at-point)))))
+
+(ert-deftest non-import-import-parse ()
+  (should (equal nil
+		 (with-temp-buffer
+		   (insert-lines "something import Nothing")
+		   (goto-char (point-min))
+		   (forward-line 0)
+		   (haskell-utils-parse-import-statement-at-point)))))
+
+(ert-deftest many-spaces-import-parse ()
+  (should (equal "M"
+		 (with-temp-buffer
+		   (insert-lines "\t import\t qualified \t\tM\tas G")
+		   (goto-char (point-min))
+		   (forward-line 0)
+		   (haskell-utils-parse-import-statement-at-point)))))
+
+(ert-deftest using-underscores-import-parse ()
+  (should (equal "Module_1.S_3_3_"
+		 (with-temp-buffer
+		   (insert-lines "import Module_1.S_3_3_")
+		   (goto-char (point-min))
+		   (forward-line 0)
+		   (haskell-utils-parse-import-statement-at-point)))))
+
+(ert-deftest slightly-malformed-import-parse ()
+  (should (equal "q.Module...qwerqwe..."
+		 (with-temp-buffer
+		   (insert-lines "import q.Module...qwerqwe...")
+		   (goto-char (point-min))
+		   (forward-line 0)
+		   (haskell-utils-parse-import-statement-at-point)))))
+
+(ert-deftest package-import-parse ()
+  (should (equal "B"
+		 (with-temp-buffer
+		   (insert-lines "import \"package-1.2.3\" B")
+		   (goto-char (point-min))
+		   (forward-line 0)
+		   (haskell-utils-parse-import-statement-at-point)))))
+
+(ert-deftest safe-haskell-import-parse ()
+  (should (equal "B"
+		 (with-temp-buffer
+		   (insert-lines "import safe B")
+		   (goto-char (point-min))
+		   (forward-line 0)
+		   (haskell-utils-parse-import-statement-at-point)))))
+
+(ert-deftest full-import-parse ()
+  (should (equal "Data.Char.Unicode_v_7"
+		 (with-temp-buffer
+		   (insert-lines "import safe qualified \"unicode-7.0\" Data.Char.Unicode_v_7 as U (func)")
+		   (goto-char (point-min))
+		   (forward-line 0)
+		   (haskell-utils-parse-import-statement-at-point)))))