diff --git a/lib/Configuration.php b/lib/Configuration.php
index b6b9f6f4..d9d70bff 100644
--- a/lib/Configuration.php
+++ b/lib/Configuration.php
@@ -100,7 +100,7 @@ class Configuration
     public function __construct()
     {
         $config     = array();
-        $configFile = PATH . 'cfg' . DIRECTORY_SEPARATOR . 'conf.ini';
+        $configFile = PATH . 'cfg' . DIRECTORY_SEPARATOR . 'conf.php';
         if (is_readable($configFile)) {
             $config = parse_ini_file($configFile, true);
             foreach (array('main', 'model', 'model_options') as $section) {
diff --git a/tst/JsonApiTest.php b/tst/JsonApiTest.php
index a5928893..cd27cd83 100644
--- a/tst/JsonApiTest.php
+++ b/tst/JsonApiTest.php
@@ -283,7 +283,7 @@ class JsonApiTest extends PHPUnit_Framework_TestCase
         $this->reset();
         $paste = Helper::getPasteWithAttachment();
         $this->_model->create(Helper::getPasteId(), $paste);
-        $_GET['jsonld'] = '../cfg/conf.ini';
+        $_GET['jsonld'] = CONF;
         ob_start();
         new PrivateBin;
         $content = ob_get_contents();