diff --git a/editorconfig-core-handle.el b/editorconfig-core-handle.el
index afe2dfdf..688da443 100644
--- a/editorconfig-core-handle.el
+++ b/editorconfig-core-handle.el
@@ -200,8 +200,8 @@ If CONF is not found return nil."
             )
         (while (not (eq (point) point-max))
           (setq line
-                (buffer-substring-no-properties (point-at-bol)
-                                                (point-at-eol)))
+                (buffer-substring-no-properties (line-beginning-position)
+                                                (line-end-position)))
           (setq line
                 (replace-regexp-in-string "\\(^\\| \\)\\(#\\|;\\).*$"
                                           ""
diff --git a/editorconfig.el b/editorconfig.el
index ad1d72b0..2a453b48 100644
--- a/editorconfig.el
+++ b/editorconfig.el
@@ -95,13 +95,13 @@ your init.el:
 
 Possible known values are:
 
-* `editorconfig-core-get-properties-hash' (default)
+* `editorconfig-core-get-properties-hash\\=' (default)
   * Always use built-in Emacs-Lisp implementation to get properties
 * `editorconfig-get-properties'
-  * Use `editorconfig-get-properties-from-exec' when
+  * Use `editorconfig-get-properties-from-exec\\=' when
     `editorconfig-exec-path' executable is found, otherwise
-    use `editorconfig-core-get-properties-hash'
-* `editorconfig-get-properties-from-exec'
+    use `editorconfig-core-get-properties-hash\\='
+* `editorconfig-get-properties-from-exec\\='
   * Get properties by executing EditorConfig executable"
   :type 'function
   :group 'editorconfig)
diff --git a/ert-tests/editorconfig-core-handle.el b/ert-tests/editorconfig-core-handle.el
index 8447c676..96855ed2 100644
--- a/ert-tests/editorconfig-core-handle.el
+++ b/ert-tests/editorconfig-core-handle.el
@@ -3,6 +3,8 @@
 (defconst fixtures (concat (file-name-directory load-file-name)
                            "fixtures/"))
 
+(set-variable 'vc-handled-backends nil)
+
 (ert-deftest test-editorconfig-core-handle ()
   ;; handle.ini
   (let* ((conf (concat fixtures
diff --git a/ert-tests/editorconfig-core.el b/ert-tests/editorconfig-core.el
index a09d38b2..b7261fba 100644
--- a/ert-tests/editorconfig-core.el
+++ b/ert-tests/editorconfig-core.el
@@ -1,5 +1,6 @@
 (require 'editorconfig-core)
 
+(set-variable 'vc-handled-backends nil)
 
 (ert-deftest test-editorconfig-core--get-handles ()
   (let* ((fixtures (concat default-directory
diff --git a/ert-tests/editorconfig-fnmatch.el b/ert-tests/editorconfig-fnmatch.el
index 40b488a4..2c98eeb3 100644
--- a/ert-tests/editorconfig-fnmatch.el
+++ b/ert-tests/editorconfig-fnmatch.el
@@ -1,5 +1,6 @@
 (require 'editorconfig-fnmatch)
 
+(set-variable 'vc-handled-backends nil)
 
 (ert-deftest test-editorconfig-fnmatch-p ()
   (let ((cases-t
diff --git a/ert-tests/editorconfig.el b/ert-tests/editorconfig.el
index 03487e98..06548592 100644
--- a/ert-tests/editorconfig.el
+++ b/ert-tests/editorconfig.el
@@ -1,5 +1,7 @@
 (require 'editorconfig)
 
+(set-variable 'vc-handled-backends nil)
+
 (defun display-warning (type message &optional level buffer-name)
   "When testing overwrite this function to throw error when called."
   (unless (eq level :debug)
diff --git a/ert-tests/metadata.el b/ert-tests/metadata.el
index 775dae2a..0108579b 100644
--- a/ert-tests/metadata.el
+++ b/ert-tests/metadata.el
@@ -1,5 +1,7 @@
 (require 'package)
 
+(set-variable 'vc-handled-backends nil)
+
 (defvar metadata-el-files nil)
 
 (ert-deftest test-metadata ()