diff --git a/lib/ansible/runner.py b/lib/ansible/runner.py
index dd7b66af27..7515f61783 100755
--- a/lib/ansible/runner.py
+++ b/lib/ansible/runner.py
@@ -404,8 +404,9 @@ class Runner(object):
             return (host, True, dict(failed=True, msg="src and dest are required"), '')
 
         # files are saved in dest dir, with a subdir for each host, then the filename
-        filename = os.path.basename(source)
-        dest   = "%s/%s/%s" % (utils.path_dwim(self.basedir, dest), host, filename)
+        dest   = "%s/%s/%s" % (utils.path_dwim(self.basedir, dest), host, source)
+        dest   = dest.replace("//","/")
+        print "DEST=%s" % dest
 
         # compare old and new md5 for support of change hooks
         local_md5 = None
diff --git a/test/TestRunner.py b/test/TestRunner.py
index fc890125a5..529b4a6965 100644
--- a/test/TestRunner.py
+++ b/test/TestRunner.py
@@ -201,9 +201,8 @@ class TestRunner(unittest.TestCase):
 
    def test_fetch(self):
        input = self._get_test_file('sample.j2')
-       output = self._get_stage_file('127.0.0.2/sample.j2')
+       output = os.path.join(self.stage_dir, '127.0.0.2', input)
        result = self._run('fetch', [ "src=%s" % input, "dest=%s" % self.stage_dir ])
-       print "output file=%s" % output
        assert os.path.exists(output)
        assert open(input).read() == open(output).read()