--- a/mx.jvmci/mx_jvmci.py	Mon Jul 27 13:40:24 2015 +0200
+++ b/mx.jvmci/mx_jvmci.py	Mon Jul 27 15:44:03 2015 +0200
@@ -765,10 +765,7 @@
 def _hotspotReplaceResultsVar(m):
     var = m.group(1)
     if var == 'os':
-        mx_os = mx.get_os()
-        if mx_os == 'darwin':
-            return 'bsd'
-        return mx_os
+        return _hotspotOs(mx.get_os())
     if var == 'nojvmci':
         if get_vm().endswith('nojvmci'):
             return '-nojvmci'
@@ -792,6 +789,11 @@
     def getBuildTask(self, args):
         return HotSpotBuildTask(self, args, _vmbuild, get_vm())
 
+def _hotspotOs(mx_os):
+    if mx_os == 'darwin':
+        return 'bsd'
+    return mx_os
+
 def _hotspotGetVariant(vm=None):
     if not vm:
         vm = get_vm()
@@ -869,7 +871,7 @@
             setMakeVar('MAKE_VERBOSE', 'y' if mx._opts.verbose else '')
             if self.vm.endswith('nojvmci'):
                 setMakeVar('INCLUDE_JVMCI', 'false')
-                setMakeVar('ALT_OUTPUTDIR', join(_suite.dir, 'build-nojvmci', mx.get_os()), env=env)
+                setMakeVar('ALT_OUTPUTDIR', join(_suite.dir, 'build-nojvmci', _hotspotOs(mx.get_os())), env=env)
             else:
                 version = _suite.release_version()
                 setMakeVar('USER_RELEASE_SUFFIX', 'jvmci-' + version)