diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
 ## MASTER
+## Dotenv 0.5.2.2
+* Support `megaparsec` >= 6.4.0
+
 ## Dotenv 0.5.2.1
 
 * Update documentation for Configuration.Dotenv.Types
diff --git a/dotenv.cabal b/dotenv.cabal
--- a/dotenv.cabal
+++ b/dotenv.cabal
@@ -1,5 +1,5 @@
 name:                dotenv
-version:             0.5.2.1
+version:             0.5.2.2
 synopsis:            Loads environment variables from dotenv files
 homepage:            https://github.com/stackbuilders/dotenv-hs
 description:
diff --git a/spec/Configuration/DotenvSpec.hs b/spec/Configuration/DotenvSpec.hs
--- a/spec/Configuration/DotenvSpec.hs
+++ b/spec/Configuration/DotenvSpec.hs
@@ -8,7 +8,7 @@
 import Test.Hspec
 
 import System.Process (readCreateProcess, shell)
-import System.Environment (lookupEnv, getEnv)
+import System.Environment (lookupEnv)
 import Control.Monad (liftM, void)
 import Data.Maybe (fromMaybe)
 #if !MIN_VERSION_base(4,8,0)
@@ -20,9 +20,9 @@
 #endif
 
 #if MIN_VERSION_base(4,7,0)
-import System.Environment (setEnv, unsetEnv)
+import System.Environment (getEnvironment, setEnv, unsetEnv)
 #else
-import System.Environment.Compat (setEnv, unsetEnv)
+import System.Environment.Compat (getEnvironment, setEnv, unsetEnv)
 #endif
 
 {-# ANN module "HLint: ignore Reduce duplication" #-}
@@ -32,7 +32,7 @@
 
 spec :: Spec
 spec = do
-  describe "load" $ after_ (unsetEnv "foo") $ do
+  describe "load" $ after_ clearEnvs $ do
     it "loads the given list of configuration options to the environment" $ do
       lookupEnv "foo" `shouldReturn` Nothing
 
@@ -54,7 +54,7 @@
 
       lookupEnv "foo" `shouldReturn` Just "new setting"
 
-  describe "loadFile" $ after_ (mapM_ unsetEnv ["DOTENV" , "ANOTHER_ENV"]) $ do
+  describe "loadFile" $ before_ setupEnv $ after_ clearEnvs $  do
     it "loads the configuration options to the environment from a file" $ do
       lookupEnv "DOTENV" `shouldReturn` Nothing
 
@@ -80,20 +80,27 @@
       let config = Config ["spec/fixtures/.dotenv"] ["spec/fixtures/.dotenv.example"] False
 
       context "when the needed env vars are missing" $
-        it "should fail with an error call" $
+        it "should fail with an error call" $ do
+          unsetEnv "ANOTHER_ENV"
           void $ loadFile config `shouldThrow` anyErrorCall
 
       context "when the needed env vars are not missing" $
         it "should succeed when loading all of the needed env vars" $ do
-          setEnv "ANOTHER_ENV" "hello"
-          me <- getEnv "USER"
-          home <- getEnv "HOME"
-          loadFile config `shouldReturn` [("DOTENV","true"),("UNICODE_TEST","Manab\237"),("ENVIRONMENT", home),("PREVIOUS","true"),("ME", me),("ANOTHER_ENV","")]
+          -- Load extra information
+          me <- init <$> readCreateProcess (shell "whoami") ""
+          home <- fromMaybe "" <$> lookupEnv "HOME"
+
+          -- Load envs
+          void $ loadFile config
+
+          -- Check existing envs
+          lookupEnv "ENVIRONMENT" `shouldReturn` Just home
+          lookupEnv "ME" `shouldReturn` Just me
           lookupEnv "DOTENV" `shouldReturn` Just "true"
           lookupEnv "UNICODE_TEST" `shouldReturn` Just "Manabí"
           lookupEnv "ANOTHER_ENV" `shouldReturn` Just "hello"
 
-  describe "parseFile" $ after_ (unsetEnv "DOTENV") $ do
+  describe "parseFile" $ after_ clearEnvs $ do
     it "returns variables from a file without changing the environment" $ do
       lookupEnv "DOTENV" `shouldReturn` Nothing
 
@@ -120,7 +127,7 @@
       liftM (!! 4) (parseFile "spec/fixtures/.dotenv") `shouldReturn`
         ("ME", me)
 
-  describe "onMissingFile" $ after_ (unsetEnv "DOTENV") $ do
+  describe "onMissingFile" $ after_ clearEnvs $ do
     context "when target file is present" $
       it "loading works as usual" $ do
         void $ onMissingFile (loadFile $ Config ["spec/fixtures/.dotenv"] [] True) (return [])
@@ -128,5 +135,14 @@
 
     context "when target file is missing" $
       it "executes supplied handler instead" $
-        onMissingFile (True <$ (loadFile $ Config ["spec/fixtures/foo"] [] True)) (return False)
+        onMissingFile (True <$ loadFile (Config ["spec/fixtures/foo"] [] True)) (return False)
           `shouldReturn` False
+
+clearEnvs :: IO ()
+clearEnvs =
+  fmap (fmap fst) getEnvironment >>=  mapM_ unsetEnv
+
+setupEnv :: IO ()
+setupEnv = do
+  setEnv "ANOTHER_ENV" "hello"
+  setEnv "HOME" "/home/me"
diff --git a/src/Configuration/Dotenv/Parse.hs b/src/Configuration/Dotenv/Parse.hs
--- a/src/Configuration/Dotenv/Parse.hs
+++ b/src/Configuration/Dotenv/Parse.hs
@@ -18,7 +18,9 @@
 module Configuration.Dotenv.Parse (configParser) where
 
 import           Configuration.Dotenv.ParsedVariable
+#if !MIN_VERSION_megaparsec(6,4,0)
 import           Control.Applicative
+#endif
 import           Control.Monad
 import           Data.Void                           (Void)
 import           Text.Megaparsec