diff --git a/includes/database/schema.inc b/includes/database/schema.inc
index de1b2f5b9b863cba5a8b01ca5bc6cc5c67db34b8..f8221e3d63475312e00299253f8e84d12a3e2566 100644
--- a/includes/database/schema.inc
+++ b/includes/database/schema.inc
@@ -5,7 +5,7 @@
  * Generic Database schema code.
  */
 
-require_once dirname(__FILE__) . '/query.inc';
+require_once __DIR__ . '/query.inc';
 
 /**
  * @defgroup schemaapi Schema API
diff --git a/includes/database/select.inc b/includes/database/select.inc
index 53be20adc6e83794c9dd585b705f3b8b525e9461..7499e540f18512c42ff3ba442600d858d467acf2 100644
--- a/includes/database/select.inc
+++ b/includes/database/select.inc
@@ -5,7 +5,7 @@
  * @{
  */
 
-require_once dirname(__FILE__) . '/query.inc';
+require_once __DIR__ . '/query.inc';
 
 /**
  * Interface for extendable query objects.
diff --git a/includes/filetransfer/filetransfer.inc b/includes/filetransfer/filetransfer.inc
index 2083da9d3f802db24f97d814771a03defc0b29f4..63e41230bf35f9136bf1cca439991adb29b7c799 100644
--- a/includes/filetransfer/filetransfer.inc
+++ b/includes/filetransfer/filetransfer.inc
@@ -296,7 +296,7 @@ function findChroot() {
       return FALSE;
     }
 
-    $path = dirname(__FILE__);
+    $path = __DIR__;
     $path = $this->fixRemotePath($path, FALSE);
     $parts = explode('/', $path);
     $chroot = '';
diff --git a/scripts/dump-database-d6.sh b/scripts/dump-database-d6.sh
index 41146b075c21870b0b832f2f90fabdecb9091a32..d39bb4306d8314f8a2085e177a148b4f1ba7dbea 100644
--- a/scripts/dump-database-d6.sh
+++ b/scripts/dump-database-d6.sh
@@ -28,7 +28,7 @@
 drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
 
 // Include the utility drupal_var_export() function.
-include_once dirname(__FILE__) . '/../includes/utility.inc';
+include_once __DIR__ . '/../includes/utility.inc';
 
 // Output the PHP header.
 $output = <<<ENDOFHEADER
diff --git a/scripts/run-tests.sh b/scripts/run-tests.sh
index 02e897e41763089e60c0850d88b150780a3b287d..dc4f2600fd3812980d6bc6bcff36329274063380 100755
--- a/scripts/run-tests.sh
+++ b/scripts/run-tests.sh
@@ -297,7 +297,7 @@ function simpletest_script_init($server_software) {
     }
   }
 
-  chdir(realpath(dirname(__FILE__) . '/..'));
+  chdir(realpath(__DIR__ . '/..'));
   define('DRUPAL_ROOT', getcwd());
   require_once DRUPAL_ROOT . '/includes/bootstrap.inc';
 }