diff --git a/Library/Environment.php b/Library/Environment.php
index 4ebde17343..167bd358e0 100644
--- a/Library/Environment.php
+++ b/Library/Environment.php
@@ -58,17 +58,13 @@ public function __construct($basePath, ContainerInterface $container = null)
      */
     public function setBasePath($basePath)
     {
-        $message = 'Unable to locate Zephir installation path.' . PHP_EOL . PHP_EOL .
-            'Double check the Zephir installation. When installing from sources,' . PHP_EOL .
-            'it is enough to specify ZEPHIRDIR environment variable to the proper' . PHP_EOL .
-            'Zephir installation path.' . PHP_EOL . PHP_EOL .
-            'Current ZEPHIRDIR value is: "%s"' . PHP_EOL .
-            'The base path used by the Zephir compiler is: "%s"';
+        $message = 'Unable to locate Zephir base directory. ' .
+            'Try to reinstall Zephir to solve this problem. ' .
+            'If the problem remains, ask for help on the forum ' .
+            '(https://forum.zephir-lang.com) or file an issue at GitHub (https://github.com/phalcon/zephir).';
 
         if (!\is_string($basePath) || !\is_dir($basePath) || !\file_exists($basePath)) {
-            throw new InvalidArgumentException(
-                sprintf($message, \getenv('ZEPHIRDIR'), \is_scalar($basePath) ? $basePath : \gettype($basePath))
-            );
+            throw new InvalidArgumentException($message);
         }
 
         $this->basePath = rtrim($basePath, '\\/');
diff --git a/appveyor.yml b/appveyor.yml
index bacdaa19a8..b6e8ddfa2e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -45,7 +45,6 @@ environment:
     COMPOSER_NO_INTERACTION: 1
     PARSER_VERSION: 1.1.3
     PARSER_RELEASE: 401
-    ZEPHIRDIR: c:\projects\zephir
     PSR_VERSION: 0.6.1
 
 matrix:
diff --git a/unit-tests/Extension/Oo/ExtendClassTest.php b/unit-tests/Extension/Oo/ExtendClassTest.php
index 359648f030..4f4d44c1da 100644
--- a/unit-tests/Extension/Oo/ExtendClassTest.php
+++ b/unit-tests/Extension/Oo/ExtendClassTest.php
@@ -52,26 +52,6 @@ public function shouldExtendMiddlewareInterface()
         );
     }
 
-    // FIXME
-    public function testInstanceOfPhalconMvcApplication()
-    {
-        /*if (!extension_loaded('phalcon')) {
-            $this->markTestSkipped('No phalcon ext loaded');
-        }
-        $class = new \Test\Oo\Extend\Application();
-        $this->assertInstanceOf('Phalcon\Mvc\Application', $class);*/
-    }
-
-    // FIXME
-    public function testInstanceOfMemcache()
-    {
-        /*if (!extension_loaded('memcache')) {
-            $this->markTestSkipped('No memcache ext loaded');
-        }
-        $class = new \Test\Oo\Extend\Memcache();
-        $this->assertInstanceOf('Memcache', $class);*/
-    }
-
     /**
      * @test
      * @issue https://github.com/phalcon/zephir/issues/1392
diff --git a/zephir b/zephir
index 2d611e4666..4af437f244 100755
--- a/zephir
+++ b/zephir
@@ -14,8 +14,6 @@ use Zephir\Bootstrap;
 
 require_once __DIR__ . '/autoload.php';
 
-$bootstrap = new Bootstrap(
-    ('phar:' === substr(__FILE__, 0, 5)) ? __DIR__ : (getenv('ZEPHIRDIR') ?: __DIR__)
-);
+$bootstrap = new Bootstrap(__DIR__);
 
 $bootstrap->execute();