diff --git a/tests/node-qunit/schema.test.js b/tests/node-qunit/schema.test.js
new file mode 100644
index 000000000..901c1e4ed
--- /dev/null
+++ b/tests/node-qunit/schema.test.js
@@ -0,0 +1,74 @@
+var mw = mediaWiki,
+	createSchema = require( '../../src/schema' );
+
+function createStubMap() {
+	var m = new Map(); /* global Map */
+	m.get = function ( key, def ) {
+		return Map.prototype.get.call( m, key ) || def;
+	};
+	return m;
+}
+
+QUnit.module( 'ext.popups/schema', {
+	setup: function () {
+		this.config = createStubMap();
+
+		this.config.set( 'wgPopupsSchemaSamplingRate', 1 );
+
+		this.window = {
+			navigator: {
+				sendBeacon: function () {}
+			}
+		};
+
+		// Stub out the mw.eventLog.Schema constructor function.
+		mw.eventLog = { Schema: this.sandbox.stub() };
+	}
+} );
+
+QUnit.test( 'it should use $wgPopupsSchemaSamplingRate as the sampling rate', function ( assert ) {
+	assert.expect( 2 );
+
+	createSchema( this.config, this.window );
+
+	assert.ok( mw.eventLog.Schema.calledWith( 'Popups', 1 ) );
+
+	// ---
+
+	createSchema( createStubMap(), this.window );
+
+	assert.ok(
+		mw.eventLog.Schema.calledWith( 'Popups', 0 ),
+		'If $wgPopupsSchemaSamplingRate isn\'t set, then the sampling rate should be 0.'
+	);
+} );
+
+QUnit.test( 'it should use a 0 sampling rate when sendBeacon isn\'t supported', function ( assert ) {
+	var expectedArgs = [ 'Popups', 0 ];
+
+	assert.expect( 2 );
+
+	createSchema( this.config, { } );
+
+	assert.deepEqual( mw.eventLog.Schema.getCall( 0 ).args, expectedArgs );
+
+	// ---
+
+	createSchema( this.config, {
+		navigator: {
+			sendBeacon: 'NOT A FUNCTION'
+		}
+	} );
+
+	assert.deepEqual( mw.eventLog.Schema.getCall( 1 ).args, expectedArgs );
+} );
+
+QUnit.test( 'it should use a 0 sampling rate in a unit testing environment', function ( assert ) {
+	assert.expect( 1 );
+
+	this.window.QUnit = {};
+
+	createSchema( this.config, this.window );
+
+	assert.ok( mw.eventLog.Schema.calledWith( 'Popups', 0 ) );
+} );
diff --git a/tests/qunit/ext.popups/schema.test.js b/tests/qunit/ext.popups/schema.test.js
deleted file mode 100644
index 8e6360474..000000000
--- a/tests/qunit/ext.popups/schema.test.js
+++ /dev/null
@@ -1,66 +0,0 @@
-( function ( mw ) {
-
-	QUnit.module( 'ext.popups/schema', {
-		setup: function () {
-			this.config = new mw.Map();
-			this.config.set( 'wgPopupsSchemaSamplingRate', 1 );
-
-			this.window = {
-				navigator: {
-					sendBeacon: function () {}
-				}
-			};
-
-			// Stub out the mw.eventLog.Schema constructor function.
-			this.sandbox.stub( mw.eventLog, 'Schema', function () {} );
-		}
-	} );
-
-	QUnit.test( 'it should use $wgPopupsSchemaSamplingRate as the sampling rate', function ( assert ) {
-		assert.expect( 2 );
-
-		mw.popups.createSchema( this.config, this.window );
-
-		assert.ok( mw.eventLog.Schema.calledWith( 'Popups', 1 ) );
-
-		// ---
-
-		mw.popups.createSchema( new mw.Map(), this.window );
-
-		assert.ok(
-			mw.eventLog.Schema.calledWith( 'Popups', 0 ),
-			'If $wgPopupsSchemaSamplingRate isn\'t set, then the sampling rate should be 0.'
-		);
-	} );
-
-	QUnit.test( 'it should use a 0 sampling rate when sendBeacon isn\'t supported', function ( assert ) {
-		var expectedArgs = [ 'Popups', 0 ];
-
-		assert.expect( 2 );
-
-		mw.popups.createSchema( this.config, { } );
-
-		assert.deepEqual( mw.eventLog.Schema.getCall( 0 ).args, expectedArgs );
-
-		// ---
-
-		mw.popups.createSchema( this.config, {
-			navigator: {
-				sendBeacon: 'NOT A FUNCTION'
-			}
-		} );
-
-		assert.deepEqual( mw.eventLog.Schema.getCall( 1 ).args, expectedArgs );
-	} );
-
-	QUnit.test( 'it should use a 0 sampling rate in a unit testing environment', function ( assert ) {
-		assert.expect( 1 );
-
-		this.window.QUnit = {};
-
-		mw.popups.createSchema( this.config, this.window );
-
-		assert.ok( mw.eventLog.Schema.calledWith( 'Popups', 0 ) );
-	} );
-
-}( mediaWiki ) );