diff --git a/test/specs/jsdoc/opts/argparser.js b/test/specs/jsdoc/opts/argparser.js
index 641eb005..3156a185 100644
--- a/test/specs/jsdoc/opts/argparser.js
+++ b/test/specs/jsdoc/opts/argparser.js
@@ -1,8 +1,10 @@
-/*global describe: true, expect: true, it: true */
-describe("jsdoc/opts/argparser", function() {
-    var ArgParser = require('jsdoc/opts/argparser'),
-        argParser = new ArgParser(),
-        ourOptions;
+/*global afterEach, beforeEach, describe, expect, it */
+'use strict';
+
+describe('jsdoc/opts/argparser', function() {
+    var ArgParser = require('jsdoc/opts/argparser');
+    var argParser;
+    var ourOptions;
 
     function trueFalse(v) {
         var r = false;
@@ -15,18 +17,154 @@ describe("jsdoc/opts/argparser", function() {
         return r;
     }
 
-    argParser.addOption('s', 'strict', true,  'Throw error on invalid input.', false, trueFalse);
-    argParser.addOption('n', 'name', true,  'The name of the project.', false);
+    beforeEach(function() {
+        argParser = new ArgParser()
+            .addOption('s', 'strict', true, 'Throw error on invalid input.', false, trueFalse)
+            .addOption('n', 'name', true, 'The name of the project.', false);
 
-    ourOptions = argParser.parse(['-s', 'true', '-n', 'true']);
-
-    it('should coerce a true value if a coercer is provided', function() {
-        expect(ourOptions.strict).toBeDefined();
-        expect(ourOptions.strict).toEqual(true);
+        ourOptions = argParser.parse(['-s', 'true', '-n', 'true']);
     });
 
-    it('should coerce a string value if no coercer is provided', function() {
-        expect(ourOptions.name).toBeDefined();
-        expect(ourOptions.name).toEqual('true');
+    it('should exist', function() {
+        expect(ArgParser).toBeDefined();
     });
-});
\ No newline at end of file
+
+    it('should be a constructor', function() {
+        expect(typeof ArgParser).toBe('function');
+        expect(new ArgParser() instanceof ArgParser).toBe(true);
+    });
+
+    describe('ArgParser', function() {
+        it('should provide an "addIgnoredOption" method', function() {
+            expect(argParser.addIgnoredOption).toBeDefined();
+            expect(typeof argParser.addIgnoredOption).toBe('function');
+        });
+
+        it('should provide an "addOption" method', function() {
+            expect(argParser.addOption).toBeDefined();
+            expect(typeof argParser.addOption).toBe('function');
+        });
+
+        it('should provide a "help" method', function() {
+            expect(argParser.help).toBeDefined();
+            expect(typeof argParser.help).toBe('function');
+        });
+
+        it('should provide a "parse" method', function() {
+            expect(argParser.parse).toBeDefined();
+            expect(typeof argParser.parse).toBe('function');
+        });
+
+        describe('addIgnoredOption', function() {
+            it('should be chainable', function() {
+                expect(argParser.addIgnoredOption({})).toBe(argParser);
+            });
+        });
+
+        describe('addOption', function() {
+            it('should be chainable', function() {
+                expect(argParser.addOption('a', null, false, 'Option')).toBe(argParser);
+            });
+        });
+
+        describe('help', function() {
+            var columns = process.stdout.columns;
+
+            beforeEach(function() {
+                process.stdout.columns = 80;
+            });
+
+            afterEach(function() {
+                process.stdout.columns = columns;
+            });
+
+            it('should format the help text correctly', function() {
+                var helpText = [
+                    'Options:',
+                    '    --noshortname                               Just a long name.',
+                    '    -o <value>                                  Only a short name.',
+                    '    -s, --supercalifragilisticexpialidocious    If you say it loud enough,',
+                    "                                                you'll always sound",
+                    '                                                precocious.'
+                ].join('\n');
+
+                argParser = new ArgParser()
+                    .addIgnoredOption('m', 'meh', false, 'Ignore me.')
+                    .addOption(null, 'noshortname', false, 'Just a long name.')
+                    .addOption('o', null, true, 'Only a short name.')
+                    .addOption('s', 'supercalifragilisticexpialidocious', false,
+                        "If you say it loud enough, you'll always sound precocious.");
+
+                expect(argParser.help()).toBe(helpText);
+            });
+        });
+
+        describe('parse', function() {
+            it('should return an object with information about the options', function() {
+                expect(typeof ourOptions).toBe('object');
+                expect(ourOptions.strict).toBe(true);
+                expect(ourOptions.name).toBe('true');
+            });
+
+            it('should merge the defaults into the command-line options', function() {
+                var defaults = {
+                    strict: false,
+                    name: 'Hello world!'
+                };
+
+                ourOptions = argParser.parse(['-s', true], defaults);
+
+                expect(ourOptions.strict).toBe(true);
+                expect(ourOptions.name).toBe(defaults.name);
+            });
+
+            it('should recognize options that can be used more than once', function() {
+                argParser.addOption(null, 'multi', true, '', true);
+
+                ourOptions = argParser.parse(['--multi', 'value1', '--multi', 'value2',
+                    '--multi', 'value3']);
+                expect(Array.isArray(ourOptions.multi)).toBe(true);
+                expect(ourOptions.multi.length).toBe(3);
+                expect(ourOptions.multi[0]).toBe('value1');
+                expect(ourOptions.multi[1]).toBe('value2');
+                expect(ourOptions.multi[2]).toBe('value3');
+            });
+
+            it('should throw an error if an unrecognized short option is used', function() {
+                function badShortOption() {
+                    argParser.parse(['-w']);
+                }
+
+                expect(badShortOption).toThrow();
+            });
+
+            it('should throw an error if an unrecognized long option is used', function() {
+                function badLongOption() {
+                    argParser.parse(['--whatever']);
+                }
+
+                expect(badLongOption).toThrow();
+            });
+
+            it('should throw an error if a required value is missing', function() {
+                function missingValue() {
+                    argParser.parse(['--requires-value']);
+                }
+
+                argParser.addOption(null, 'requires-value', true, '');
+
+                expect(missingValue).toThrow();
+            });
+
+            it('should coerce a true value if a coercer is provided', function() {
+                expect(ourOptions.strict).toBeDefined();
+                expect(ourOptions.strict).toBe(true);
+            });
+
+            it('should coerce a string value if no coercer is provided', function() {
+                expect(ourOptions.name).toBeDefined();
+                expect(ourOptions.name).toBe('true');
+            });
+        });
+    });
+});