diff --git a/php_uv.c b/php_uv.c
index 6301c52..96a6759 100644
--- a/php_uv.c
+++ b/php_uv.c
@@ -3005,11 +3005,10 @@ PHP_FUNCTION(uv_cwd)
 	char buffer[1024] = {0};
 	size_t buffer_sz = sizeof(buffer);
 	
-	/* TODO: check behavior */
 	uv_cwd(buffer, &buffer_sz);
 	buffer[buffer_sz] = '\0';
 	
-	RETURN_STRINGL(buffer, buffer_sz, 1);
+	RETURN_STRING(buffer, 1);
 }
 /* }}} */
 
diff --git a/tests/999-uv_chdir.phpt b/tests/999-uv_chdir.phpt
new file mode 100644
index 0000000..b9641c8
--- /dev/null
+++ b/tests/999-uv_chdir.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Check for uv_chdir
+--FILE--
+<?php
+@uv_chdir(); // don't SEGV
+
+uv_chdir(dirname(__FILE__));
+if (uv_cwd() == dirname(__FILE__)) {
+  echo "OK";
+} else {
+  echo "FAILED: expected " . dirname(__FILE__) . ", but " . uv_cwd();
+}
+
+--EXPECT--
+OK
\ No newline at end of file
diff --git a/tests/999-uv_cwd.phpt b/tests/999-uv_cwd.phpt
new file mode 100644
index 0000000..e483bf1
--- /dev/null
+++ b/tests/999-uv_cwd.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Check for uv_cwd
+--FILE--
+<?php
+$cwd = uv_cwd();
+
+$expected = getcwd();
+
+if ($cwd == $expected) {
+  echo "OK" . PHP_EOL;
+} else {
+  echo "FAILED: expected {$expected}, but {$cwd}" . PHP_EOL;
+
+}
+--EXPECT--
+OK
\ No newline at end of file