diff --git a/src/node_process_methods.cc b/src/node_process_methods.cc
index dfcc6641a1c5f8..80027c26ebcf15 100644
--- a/src/node_process_methods.cc
+++ b/src/node_process_methods.cc
@@ -57,10 +57,8 @@ Mutex umask_mutex;
 
 // Microseconds in a second, as a float, used in CPUUsage() below
 #define MICROS_PER_SEC 1e6
-// used in Hrtime() below
+// used in Hrtime() and Uptime() below
 #define NANOS_PER_SEC 1000000000
-// Used in Uptime()
-#define NANOS_PER_MICROS 1e3
 
 #ifdef _WIN32
 /* MAX_PATH is in characters, not bytes. Make sure we have enough headroom. */
@@ -246,7 +244,7 @@ static void Uptime(const FunctionCallbackInfo<Value>& args) {
   uv_update_time(env->event_loop());
   double uptime =
       static_cast<double>(uv_hrtime() - per_process::node_start_time);
-  Local<Number> result = Number::New(env->isolate(), uptime / NANOS_PER_MICROS);
+  Local<Number> result = Number::New(env->isolate(), uptime / NANOS_PER_SEC);
   args.GetReturnValue().Set(result);
 }
 
diff --git a/test/pummel/test-process-uptime.js b/test/parallel/test-process-uptime.js
similarity index 86%
rename from test/pummel/test-process-uptime.js
rename to test/parallel/test-process-uptime.js
index 781066371eaa31..eabb6cf2661c87 100644
--- a/test/pummel/test-process-uptime.js
+++ b/test/parallel/test-process-uptime.js
@@ -24,14 +24,14 @@ require('../common');
 const assert = require('assert');
 
 console.error(process.uptime());
-assert.ok(process.uptime() <= 2);
+// Add some wiggle room for different platforms.
+// Verify that the returned value is in seconds -
+// 15 seconds should be a good estimate.
+assert.ok(process.uptime() <= 15);
 
 const original = process.uptime();
 
 setTimeout(function() {
   const uptime = process.uptime();
-  // some wiggle room to account for timer
-  // granularity, processor speed, and scheduling
-  assert.ok(uptime >= original + 2);
-  assert.ok(uptime <= original + 3);
-}, 2000);
+  assert.ok(original < uptime);
+}, 10);