diff --git a/lib/experiments.js b/lib/experiments.js
index 47049467a6dde65252ea79cecdd5013980cd1a4d..0cf090c183838bf3bda267b0c818034bf2edca67 100644
--- a/lib/experiments.js
+++ b/lib/experiments.js
@@ -33,7 +33,7 @@ function isValidGroupName(name) {
  * @return {boolean}
  */
 function isValidSubjectId(id) {
-    const regex = /^[A-Za-z0-9+/]*$/;
+    const regex = /^[-_A-Za-z0-9]*$/;
     return regex.test(id) && id.length === 22;
 }
 
diff --git a/test/eventgate-wikimedia.js b/test/eventgate-wikimedia.js
index 5106de5c1a361bfedec29e7ae03da60c92a4a1e7..6552dfafdd522df879c64a28d1fff55c24d915fc 100644
--- a/test/eventgate-wikimedia.js
+++ b/test/eventgate-wikimedia.js
@@ -51,7 +51,7 @@ describe('wikimedia-eventgate makeMapToErrorEvent', () => {
         assert.strictEqual(errorEvent.errored_stream_name, event.meta.stream);
     });
 
-    it.only('Should make an error event for HoistingError', () => {
+    it('Should make an error event for HoistingError', () => {
         const error = new HoistingError(
             'was invalid',
             [ { dataPath: '.bad.field', message: 'what a bad field' } ]
diff --git a/test/experiments.js b/test/experiments.js
index a3ac0b0e9a8655fe01a9f54ab9fa50a7d599ec63..a267a39c8f0bee740a4f5a8d15149807c7501f5c 100644
--- a/test/experiments.js
+++ b/test/experiments.js
@@ -1,15 +1,11 @@
 'use strict';
 
 const rewire = require('rewire');
-const bunyan = require('bunyan');
 const assert = require('assert');
-const _      = require('lodash');
 
 // Use rewire to access non exported functions for unit testing.
 const experimentsModule = rewire('../lib/experiments');
 
-const logger = bunyan.createLogger({ name: 'test/experiments', level: 'fatal' });
-
 const longString = Array(64).fill('a').join();
 
 describe('isValidExperimentName', () => {
@@ -99,18 +95,6 @@ describe('getEnrolledExperiment', () => {
     const experimentName = '2025-abtests2-foo-10x10';
     const groupName = 'grp0';
 
-    const testExperimentEvent = {
-        $schema: '/analytics/experiment/0.0.1',
-        meta: {
-            stream: 'test.experiment.event',
-            dt: '2021-01-01T00:00:00.0Z'
-        },
-        experiment: {
-            subject_id: 'awaiting',
-            enrolled: experimentName,
-            assigned: groupName
-        }
-    };
     const xExperimentEnrollmentsHeader = '2025-abtests2-foo-10x10=grp0/cSbN4iEngsnYMz1vEK9O6g;2025-abtests2-sel1-4x25=grp1/ckNy35nnQikEwoey8XS1Lw;2025-abtests2-sel2-4x25=grp1/ckNy35nnQikEwoey8XS1Lw;2025-abtests2-udom=grp2/yHi9O8ylLWG2qFw1FfCHww;';
 
     it('Returns undefined if event is not enrolled in an experiment', () => {