diff --git a/types/mithril/test/test-api.ts b/types/mithril/test/test-api.ts
index 69f86c5ee4..73e03edeae 100644
--- a/types/mithril/test/test-api.ts
+++ b/types/mithril/test/test-api.ts
@@ -1,8 +1,8 @@
// Typescript adaptation of mithril's test suite.
// Not intended to be run; only to compile & check types.
-import * as m from 'mithril';
-import * as stream from 'mithril/stream';
+import m = require('mithril');
+import stream = require('mithril/stream');
const FRAME_BUDGET = 100;
diff --git a/types/mithril/test/test-class-component.ts b/types/mithril/test/test-class-component.ts
index ceaf9d08d3..0b70773c9e 100644
--- a/types/mithril/test/test-class-component.ts
+++ b/types/mithril/test/test-class-component.ts
@@ -1,4 +1,4 @@
-import * as m from 'mithril';
+import m = require('mithril');
import { ClassComponent, Vnode, CVnode, CVnodeDOM } from 'mithril';
///////////////////////////////////////////////////////////
diff --git a/types/mithril/test/test-component.ts b/types/mithril/test/test-component.ts
index 781cdedbe3..7e16dcd3d7 100644
--- a/types/mithril/test/test-component.ts
+++ b/types/mithril/test/test-component.ts
@@ -1,4 +1,4 @@
-import * as m from 'mithril';
+import m = require('mithril');
import { Comp, Component } from 'mithril';
diff --git a/types/mithril/test/test-factory-component.ts b/types/mithril/test/test-factory-component.ts
index ba438a3789..6d0102fe38 100644
--- a/types/mithril/test/test-factory-component.ts
+++ b/types/mithril/test/test-factory-component.ts
@@ -1,4 +1,4 @@
-import * as m from 'mithril';
+import m = require('mithril');
import { Component, FactoryComponent, Vnode } from 'mithril';
///////////////////////////////////////////////////////////
diff --git a/types/mithril/test/test-fragment.ts b/types/mithril/test/test-fragment.ts
index 5e60952741..814d787c7d 100644
--- a/types/mithril/test/test-fragment.ts
+++ b/types/mithril/test/test-fragment.ts
@@ -1,6 +1,6 @@
import * as m from 'mithril';
import { Vnode } from 'mithril';
-import * as h from 'mithril/hyperscript';
+import h = require('mithril/hyperscript');
const vnode = m.fragment({id: 'abc'}, ['test']);
diff --git a/types/mithril/test/test-misc.ts b/types/mithril/test/test-misc.ts
index fbb7e83d36..3f377fec60 100644
--- a/types/mithril/test/test-misc.ts
+++ b/types/mithril/test/test-misc.ts
@@ -1,8 +1,8 @@
import { trust, parseQueryString, buildQueryString } from 'mithril';
-import * as h from 'mithril/hyperscript';
+import h = require('mithril/hyperscript');
import { render } from 'mithril/render';
import { redraw } from 'mithril/redraw';
-import * as withAttr from 'mithril/withAttr';
+import withAttr = require('mithril/withAttr');
const vnode = trust('Some bold text.');
diff --git a/types/mithril/test/test-route.ts b/types/mithril/test/test-route.ts
index 523780261d..7f82c9fa40 100644
--- a/types/mithril/test/test-route.ts
+++ b/types/mithril/test/test-route.ts
@@ -1,6 +1,6 @@
import { Vnode, Component, Comp, ClassComponent, FactoryComponent, RouteResolver } from 'mithril';
-import * as h from 'mithril/hyperscript';
-import * as route from 'mithril/route';
+import h = require('mithril/hyperscript');
+import route = require('mithril/route');
const component1 = {
view() {
diff --git a/types/mithril/test/test-stream.ts b/types/mithril/test/test-stream.ts
index 559f339634..ff86d62211 100644
--- a/types/mithril/test/test-stream.ts
+++ b/types/mithril/test/test-stream.ts
@@ -1,4 +1,4 @@
-import * as stream from 'mithril/stream';
+import stream = require('mithril/stream');
import { Stream } from 'mithril/stream';
{
diff --git a/types/mock-raf/mock-raf-tests.ts b/types/mock-raf/mock-raf-tests.ts
index d773d1c760..f277570cbd 100644
--- a/types/mock-raf/mock-raf-tests.ts
+++ b/types/mock-raf/mock-raf-tests.ts
@@ -1,4 +1,4 @@
-import * as createMockRaf from 'mock-raf';
+import createMockRaf = require('mock-raf');
const mockRaf = createMockRaf();
const id = mockRaf.raf(() => {
diff --git a/types/moment-business-time/moment-business-time-tests.ts b/types/moment-business-time/moment-business-time-tests.ts
index 79f25a720a..6fccc96580 100644
--- a/types/moment-business-time/moment-business-time-tests.ts
+++ b/types/moment-business-time/moment-business-time-tests.ts
@@ -1,4 +1,4 @@
-import * as moment from 'moment';
+import moment = require('moment');
import 'moment-business-time';
moment('2015-02-28T10:00:00Z').nextWorkingDay();
diff --git a/types/moment-business/moment-business-tests.ts b/types/moment-business/moment-business-tests.ts
index 4f8ae296df..db79dc7d84 100644
--- a/types/moment-business/moment-business-tests.ts
+++ b/types/moment-business/moment-business-tests.ts
@@ -1,4 +1,4 @@
-import * as moment from "moment";
+import moment = require("moment");
import * as mb from "moment-business";
mb.isWeekDay(moment());
diff --git a/types/moment-jalaali/index.d.ts b/types/moment-jalaali/index.d.ts
index e6fc2a6488..02580d8774 100644
--- a/types/moment-jalaali/index.d.ts
+++ b/types/moment-jalaali/index.d.ts
@@ -3,7 +3,7 @@
// Definitions by: Ali Taheri Moghaddar
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-import * as moment from 'moment';
+import moment = require('moment');
export = moment;
diff --git a/types/moment-jalaali/moment-jalaali-tests.ts b/types/moment-jalaali/moment-jalaali-tests.ts
index 40c31963cb..ce183f635d 100644
--- a/types/moment-jalaali/moment-jalaali-tests.ts
+++ b/types/moment-jalaali/moment-jalaali-tests.ts
@@ -1,4 +1,4 @@
-import * as moment from 'moment-jalaali';
+import moment = require('moment-jalaali');
moment.loadPersian();
diff --git a/types/moment-range/index.d.ts b/types/moment-range/index.d.ts
index eb9bb30910..e0298abd8e 100644
--- a/types/moment-range/index.d.ts
+++ b/types/moment-range/index.d.ts
@@ -6,7 +6,7 @@
// MartynasZilinskas
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-import * as moment from 'moment';
+import moment = require('moment');
export class DateRange {
start: moment.Moment;
diff --git a/types/moment-range/moment-range-tests.ts b/types/moment-range/moment-range-tests.ts
index 6043d3b203..fc9a8b6e12 100644
--- a/types/moment-range/moment-range-tests.ts
+++ b/types/moment-range/moment-range-tests.ts
@@ -1,4 +1,4 @@
-import * as moment from "moment";
+import moment = require("moment");
import * as momentRange from "moment-range";
const range: momentRange.DateRange = new momentRange.DateRange(new Date(2012, 0, 15), new Date(2012, 4, 23));
diff --git a/types/moment-round/moment-round-tests.ts b/types/moment-round/moment-round-tests.ts
index 4e3829671a..7400e63cc6 100644
--- a/types/moment-round/moment-round-tests.ts
+++ b/types/moment-round/moment-round-tests.ts
@@ -1,4 +1,4 @@
-import * as moment from 'moment';
+import moment = require('moment');
const m = moment();
m.round(5, 'seconds');
diff --git a/types/move-concurrently/move-concurrently-tests.ts b/types/move-concurrently/move-concurrently-tests.ts
index 58394efcfa..6e62ced8ad 100644
--- a/types/move-concurrently/move-concurrently-tests.ts
+++ b/types/move-concurrently/move-concurrently-tests.ts
@@ -1,4 +1,4 @@
-import * as move from 'move-concurrently';
+import move = require('move-concurrently');
move('/path/to/thing', '/new/path/thing').then(() => {
// thing is now moved!
@@ -6,7 +6,7 @@ move('/path/to/thing', '/new/path/thing').then(() => {
// oh no!
});
-import * as Bluebird from 'bluebird';
+import Bluebird = require('bluebird');
// tsc version: 2.7.0-dev.20171024
// required type arguments!
diff --git a/types/mri/mri-tests.ts b/types/mri/mri-tests.ts
index c766587db1..07911ca7f7 100644
--- a/types/mri/mri-tests.ts
+++ b/types/mri/mri-tests.ts
@@ -1,4 +1,4 @@
-import * as mri from 'mri';
+import mri = require('mri');
const first = mri(['--foo', 'bar']);
diff --git a/types/multimatch/multimatch-tests.ts b/types/multimatch/multimatch-tests.ts
index b8c9cac658..6e687a2cdc 100644
--- a/types/multimatch/multimatch-tests.ts
+++ b/types/multimatch/multimatch-tests.ts
@@ -1,4 +1,4 @@
-import * as multimatch from "multimatch";
+import multimatch = require("multimatch");
const options: multimatch.MultimatchOptions = {
debug: true
diff --git a/types/multisort/multisort-tests.ts b/types/multisort/multisort-tests.ts
index 6fadab16ef..bdec580a46 100644
--- a/types/multisort/multisort-tests.ts
+++ b/types/multisort/multisort-tests.ts
@@ -1,4 +1,4 @@
-import * as multisort from 'multisort';
+import multisort = require('multisort');
const gameShowHosts = [
{
diff --git a/types/murmurhash-js/index.d.ts b/types/murmurhash-js/index.d.ts
index 360850b7ec..31f2785353 100644
--- a/types/murmurhash-js/index.d.ts
+++ b/types/murmurhash-js/index.d.ts
@@ -3,8 +3,8 @@
// Definitions by: Chi Vinh Le
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-import * as murmur2 from "./murmurhash2_gc";
-import * as murmur3 from "./murmurhash3_gc";
+import murmur2 = require("./murmurhash2_gc");
+import murmur3 = require("./murmurhash3_gc");
declare const murmur: typeof murmur3 & {
murmur3: typeof murmur3;
diff --git a/types/murmurhash-js/murmurhash-js-tests.ts b/types/murmurhash-js/murmurhash-js-tests.ts
index 3f300d24d1..fed401a91c 100644
--- a/types/murmurhash-js/murmurhash-js-tests.ts
+++ b/types/murmurhash-js/murmurhash-js-tests.ts
@@ -1,6 +1,6 @@
-import * as murmur from 'murmurhash-js';
-import * as murmur2 from 'murmurhash-js/murmurhash2_gc';
-import * as murmur3 from 'murmurhash-js/murmurhash3_gc';
+import murmur = require('murmurhash-js');
+import murmur2 = require('murmurhash-js/murmurhash2_gc');
+import murmur3 = require('murmurhash-js/murmurhash3_gc');
let hash: number;
diff --git a/types/mv/mv-tests.ts b/types/mv/mv-tests.ts
index 079fd0efec..257290506a 100644
--- a/types/mv/mv-tests.ts
+++ b/types/mv/mv-tests.ts
@@ -1,4 +1,4 @@
-import * as mv from 'mv';
+import mv = require('mv');
() => {
mv('/tmp/f1.txt', '/tmp/f2.txt', error => {
diff --git a/types/nats-hemera/nats-hemera-tests.ts b/types/nats-hemera/nats-hemera-tests.ts
index 28c0c724c9..0e4fa69b93 100644
--- a/types/nats-hemera/nats-hemera-tests.ts
+++ b/types/nats-hemera/nats-hemera-tests.ts
@@ -1,4 +1,4 @@
-import * as Hemera from 'nats-hemera';
+import Hemera = require('nats-hemera');
const nats = {};
const hemera: any = new Hemera(nats, {});
diff --git a/types/natsort/natsort-tests.ts b/types/natsort/natsort-tests.ts
index 4e9d0c0fcb..73976647d6 100644
--- a/types/natsort/natsort-tests.ts
+++ b/types/natsort/natsort-tests.ts
@@ -1,4 +1,4 @@
-import * as natsort from "natsort";
+import natsort = require("natsort");
const someArr = [2, 5, 3, 4, 1, 'a', 'B'];
diff --git a/types/ndarray/ndarray-tests.ts b/types/ndarray/ndarray-tests.ts
index 899f43efd5..aa4f4fcefb 100644
--- a/types/ndarray/ndarray-tests.ts
+++ b/types/ndarray/ndarray-tests.ts
@@ -1,4 +1,4 @@
-import * as ndarray from 'ndarray';
+import ndarray = require('ndarray');
const data = new Int32Array(2 * 2 * 2 + 10);
const a = ndarray(data, [2, 2, 2], [1, 2, 4], 5);
diff --git a/types/npm-package-arg/npm-package-arg-tests.ts b/types/npm-package-arg/npm-package-arg-tests.ts
index ed95eb5243..d7f08c6c10 100644
--- a/types/npm-package-arg/npm-package-arg-tests.ts
+++ b/types/npm-package-arg/npm-package-arg-tests.ts
@@ -1,4 +1,4 @@
-import * as npa from "npm-package-arg";
+import npa = require("npm-package-arg");
const result1 = npa("npm-package-arg@5.1");
const result2 = npa("npm-package-arg@5.1", "..");
diff --git a/types/ns-api/ns-api-tests.ts b/types/ns-api/ns-api-tests.ts
index 5063a97e48..ab8c7e343d 100644
--- a/types/ns-api/ns-api-tests.ts
+++ b/types/ns-api/ns-api-tests.ts
@@ -1,4 +1,4 @@
-import * as NsApi from "ns-api";
+import NsApi = require("ns-api");
declare var console: { log(msg: any): string };
diff --git a/types/o.js/o.js-tests.ts b/types/o.js/o.js-tests.ts
index 26cc187723..be3e5c824a 100644
--- a/types/o.js/o.js-tests.ts
+++ b/types/o.js/o.js-tests.ts
@@ -1,4 +1,4 @@
-import * as o from 'o.js';
+import o = require('o.js');
import * as Q from "q";
interface Product {
diff --git a/types/object-assign/object-assign-tests.ts b/types/object-assign/object-assign-tests.ts
index e7c58cf5fb..dc8db6ba07 100644
--- a/types/object-assign/object-assign-tests.ts
+++ b/types/object-assign/object-assign-tests.ts
@@ -1,4 +1,4 @@
-import * as objectAssign from 'object-assign';
+import objectAssign = require('object-assign');
interface Target {
hellow: string;
@@ -9,7 +9,7 @@ interface Source1 {
}
interface Result extends Target, Source1 {
-
+
}
interface Source2 {
@@ -17,7 +17,7 @@ interface Source2 {
}
interface Result2 extends Result, Source2 {
-
+
}
interface Source3 {
@@ -25,7 +25,7 @@ interface Source3 {
}
interface Result3 extends Result2, Source3 {
-
+
}
interface Source4 {
@@ -33,7 +33,7 @@ interface Source4 {
}
interface Result4 extends Result3, Source4 {
-
+
}
interface Source5 {
@@ -41,7 +41,7 @@ interface Source5 {
}
interface Result5 extends Result4, Source5 {
-
+
}
function assign1(): Result {
diff --git a/types/object-refs/object-refs-tests.ts b/types/object-refs/object-refs-tests.ts
index 9b602aea0d..ba71756c3c 100644
--- a/types/object-refs/object-refs-tests.ts
+++ b/types/object-refs/object-refs-tests.ts
@@ -1,4 +1,4 @@
-import * as Refs from 'object-refs';
+import Refs = require('object-refs');
let refs = new Refs({ name: 'wheels', collection: true, enumerable: true }, { name: 'car' });
diff --git a/types/odata/odata-tests.ts b/types/odata/odata-tests.ts
index 522dc3d529..58e1505f21 100644
--- a/types/odata/odata-tests.ts
+++ b/types/odata/odata-tests.ts
@@ -1,4 +1,4 @@
-import * as o from 'odata';
+import o = require('odata');
import * as Q from "q";
interface Product {
diff --git a/types/opentok/opentok-tests.ts b/types/opentok/opentok-tests.ts
index c0f93f333f..28553463b4 100644
--- a/types/opentok/opentok-tests.ts
+++ b/types/opentok/opentok-tests.ts
@@ -1,4 +1,4 @@
-import * as OpenTok from 'opentok';
+import OpenTok = require('opentok');
const client = new OpenTok('API_KEY', 'API_SECRET');
diff --git a/types/parent-package-json/parent-package-json-tests.ts b/types/parent-package-json/parent-package-json-tests.ts
index 41a5a7bdd0..50091ff376 100644
--- a/types/parent-package-json/parent-package-json-tests.ts
+++ b/types/parent-package-json/parent-package-json-tests.ts
@@ -1,4 +1,4 @@
-import * as parent from 'parent-package-json';
+import parent = require('parent-package-json');
const hasParent = parent('/optional/path/', 1);
diff --git a/types/parse-link-header/parse-link-header-tests.ts b/types/parse-link-header/parse-link-header-tests.ts
index 01a4de8a8f..ce32e1a1cd 100644
--- a/types/parse-link-header/parse-link-header-tests.ts
+++ b/types/parse-link-header/parse-link-header-tests.ts
@@ -1,4 +1,4 @@
-import * as parse from "parse-link-header";
+import parse = require("parse-link-header");
const linkHeader =
'; rel="next", ' +
diff --git a/types/password-hash-and-salt/password-hash-and-salt-tests.ts b/types/password-hash-and-salt/password-hash-and-salt-tests.ts
index 4865cf0eed..f224074555 100644
--- a/types/password-hash-and-salt/password-hash-and-salt-tests.ts
+++ b/types/password-hash-and-salt/password-hash-and-salt-tests.ts
@@ -1,4 +1,4 @@
-import * as password from 'password-hash-and-salt';
+import password = require('password-hash-and-salt');
const myuser: { hash: string } = { hash: '' };
diff --git a/types/photoswipe/photoswipe-tests.ts b/types/photoswipe/photoswipe-tests.ts
index 05cdb5db53..48add333c5 100644
--- a/types/photoswipe/photoswipe-tests.ts
+++ b/types/photoswipe/photoswipe-tests.ts
@@ -1,5 +1,5 @@
-import * as PhotoSwipeUI_Default from './dist/photoswipe-ui-default/index';
-import * as PhotoSwipe from './index';
+import PhotoSwipeUI_Default = require('./dist/photoswipe-ui-default/index');
+import PhotoSwipe = require('./index');
function test_defaultUI() {
var items: PhotoSwipeUI_Default.Item[] = [
diff --git a/types/pick-weight/pick-weight-tests.ts b/types/pick-weight/pick-weight-tests.ts
index 5707b1c598..a7b35e7e37 100644
--- a/types/pick-weight/pick-weight-tests.ts
+++ b/types/pick-weight/pick-weight-tests.ts
@@ -1,4 +1,4 @@
-import * as weight from "pick-weight";
+import weight = require("pick-weight");
const x = weight(["a", "b", "c"], [1, 2, 3]);
diff --git a/types/pify/pify-tests.ts b/types/pify/pify-tests.ts
index f77eb9f10d..27022b7390 100644
--- a/types/pify/pify-tests.ts
+++ b/types/pify/pify-tests.ts
@@ -1,4 +1,4 @@
-import * as pify from 'pify';
+import pify = require('pify');
function assert(actual: string, expected: string): void {
if (actual !== expected) {
diff --git a/types/pikaday-time/pikaday-time-tests.ts b/types/pikaday-time/pikaday-time-tests.ts
index fec72dc553..6ae7f82406 100644
--- a/types/pikaday-time/pikaday-time-tests.ts
+++ b/types/pikaday-time/pikaday-time-tests.ts
@@ -1,7 +1,7 @@
///
-import * as Pikaday from "pikaday-time";
-import * as moment from "moment";
+import Pikaday = require("pikaday-time");
+import moment = require("moment");
new Pikaday({field: document.getElementById('datepicker')});
new Pikaday({field: $('#datepicker')[0]});
diff --git a/types/pikaday/pikaday-tests.ts b/types/pikaday/pikaday-tests.ts
index 9084455622..e61cb635e3 100644
--- a/types/pikaday/pikaday-tests.ts
+++ b/types/pikaday/pikaday-tests.ts
@@ -1,7 +1,7 @@
///
-import * as Pikaday from "pikaday";
-import * as moment from "moment";
+import Pikaday = require("pikaday");
+import moment = require("moment");
new Pikaday({field: document.getElementById('datepicker')});
new Pikaday({field: $('#datepicker')[0]});
diff --git a/types/pouch-redux-middleware/pouch-redux-middleware-tests.ts b/types/pouch-redux-middleware/pouch-redux-middleware-tests.ts
index bacd6c4b7a..a966a3edb8 100644
--- a/types/pouch-redux-middleware/pouch-redux-middleware-tests.ts
+++ b/types/pouch-redux-middleware/pouch-redux-middleware-tests.ts
@@ -1,6 +1,6 @@
import * as redux from 'redux';
import makePouchMiddleware, { Document, Path } from 'pouch-redux-middleware';
-import * as PouchDB from 'pouchdb';
+import PouchDB = require('pouchdb');
const types = {
DELETE_TODO: 'delete-todo',
diff --git a/types/pouchdb-core/pouchdb-core-tests.ts b/types/pouchdb-core/pouchdb-core-tests.ts
index d050b4c6a6..79a151aa3a 100644
--- a/types/pouchdb-core/pouchdb-core-tests.ts
+++ b/types/pouchdb-core/pouchdb-core-tests.ts
@@ -1,4 +1,4 @@
-import * as PouchDB from 'pouchdb-core';
+import PouchDB = require('pouchdb-core');
function isString(someString: string) {
}
diff --git a/types/pouchdb/pouchdb-tests.ts b/types/pouchdb/pouchdb-tests.ts
index c4b3d6870b..e5b9c356d4 100644
--- a/types/pouchdb/pouchdb-tests.ts
+++ b/types/pouchdb/pouchdb-tests.ts
@@ -1,4 +1,4 @@
-import * as PouchDB from 'pouchdb';
+import PouchDB = require('pouchdb');
function isString(someString: string) {
}
diff --git a/types/priorityqueuejs/priorityqueuejs-tests.ts b/types/priorityqueuejs/priorityqueuejs-tests.ts
index 15e9211ea8..711e1faedf 100644
--- a/types/priorityqueuejs/priorityqueuejs-tests.ts
+++ b/types/priorityqueuejs/priorityqueuejs-tests.ts
@@ -1,4 +1,4 @@
-import * as PriorityQueue from 'priorityqueuejs';
+import PriorityQueue = require('priorityqueuejs');
var queue = new PriorityQueue<{ cash: number, name: string }>(function(a, b) {
return a.cash - b.cash;
diff --git a/types/proj4/proj4-tests.ts b/types/proj4/proj4-tests.ts
index c5d549efe7..3d1ab1ab9b 100644
--- a/types/proj4/proj4-tests.ts
+++ b/types/proj4/proj4-tests.ts
@@ -1,4 +1,4 @@
-import * as proj4 from 'proj4';
+import proj4 = require('proj4');
///////////////////////////////////////////
// Tests data initialisation
diff --git a/types/promise-queue/promise-queue-tests.ts b/types/promise-queue/promise-queue-tests.ts
index fb3764c98f..b221fddc38 100644
--- a/types/promise-queue/promise-queue-tests.ts
+++ b/types/promise-queue/promise-queue-tests.ts
@@ -1,4 +1,4 @@
-import * as PromiseQueue from 'promise-queue';
+import PromiseQueue = require('promise-queue');
PromiseQueue.configure(Promise);
diff --git a/types/prompt-sync-history/prompt-sync-history-tests.ts b/types/prompt-sync-history/prompt-sync-history-tests.ts
index 40b00f2270..427d42a465 100644
--- a/types/prompt-sync-history/prompt-sync-history-tests.ts
+++ b/types/prompt-sync-history/prompt-sync-history-tests.ts
@@ -1,4 +1,4 @@
-import * as promptHistory from 'prompt-sync-history';
+import promptHistory = require('prompt-sync-history');
import * as PromptSync from 'prompt-sync';
let history:PromptSync.History;
diff --git a/types/prompt-sync/prompt-sync-tests.ts b/types/prompt-sync/prompt-sync-tests.ts
index 2c803e0a49..0d1f4f18ed 100644
--- a/types/prompt-sync/prompt-sync-tests.ts
+++ b/types/prompt-sync/prompt-sync-tests.ts
@@ -1,4 +1,4 @@
-import * as promptSync from 'prompt-sync';
+import promptSync = require('prompt-sync');
declare const history: promptSync.History;
diff --git a/types/pubnub/pubnub-tests.ts b/types/pubnub/pubnub-tests.ts
index 63bd206cde..1d8b2bb1ca 100644
--- a/types/pubnub/pubnub-tests.ts
+++ b/types/pubnub/pubnub-tests.ts
@@ -1,4 +1,4 @@
-import * as Pubnub from 'pubnub';
+import Pubnub = require('pubnub');
const console = {
log: (params: any) => {}
diff --git a/types/pure-render-decorator/pure-render-decorator-tests.ts b/types/pure-render-decorator/pure-render-decorator-tests.ts
index 4598d60b41..66f95f15f6 100644
--- a/types/pure-render-decorator/pure-render-decorator-tests.ts
+++ b/types/pure-render-decorator/pure-render-decorator-tests.ts
@@ -1,4 +1,4 @@
-import * as PureRender from 'pure-render-decorator';
+import PureRender = require('pure-render-decorator');
@PureRender
class TestClass {}
diff --git a/types/range-parser/range-parser-tests.ts b/types/range-parser/range-parser-tests.ts
index 68581e82cb..ec1ffa6e4e 100644
--- a/types/range-parser/range-parser-tests.ts
+++ b/types/range-parser/range-parser-tests.ts
@@ -1,4 +1,4 @@
-import * as RangeParser from 'range-parser';
+import RangeParser = require('range-parser');
declare var console: { assert(b: boolean): void };
diff --git a/types/raven-for-redux/raven-for-redux-tests.ts b/types/raven-for-redux/raven-for-redux-tests.ts
index 957a2017c5..481fd5bd75 100644
--- a/types/raven-for-redux/raven-for-redux-tests.ts
+++ b/types/raven-for-redux/raven-for-redux-tests.ts
@@ -1,5 +1,5 @@
import * as Raven from "raven-js";
-import * as createRavenMiddleware from "raven-for-redux";
+import createRavenMiddleware = require("raven-for-redux");
import { applyMiddleware, createStore } from "redux";
const middleware = createRavenMiddleware(Raven);
diff --git a/types/rbush/rbush-tests.ts b/types/rbush/rbush-tests.ts
index 4a2de0ef14..07061ff562 100644
--- a/types/rbush/rbush-tests.ts
+++ b/types/rbush/rbush-tests.ts
@@ -1,4 +1,4 @@
-import * as rbush from 'rbush';
+import rbush = require('rbush');
interface IndexedRect extends rbush.BBox {
index: number;
diff --git a/types/react-daterange-picker/react-daterange-picker-tests.tsx b/types/react-daterange-picker/react-daterange-picker-tests.tsx
index e1259dd81e..11bc2a3852 100644
--- a/types/react-daterange-picker/react-daterange-picker-tests.tsx
+++ b/types/react-daterange-picker/react-daterange-picker-tests.tsx
@@ -5,7 +5,7 @@ import DateRangePicker from "react-daterange-picker";
import * as ReactDateRangePicker from "react-daterange-picker";
import * as MomentRange from "moment-range";
-import * as Moment from "moment";
+import Moment = require("moment");
const moment = MomentRange.extendMoment(Moment);
diff --git a/types/read-package-tree/read-package-tree-tests.ts b/types/read-package-tree/read-package-tree-tests.ts
index 0d3595a568..1dad1c1ab0 100644
--- a/types/read-package-tree/read-package-tree-tests.ts
+++ b/types/read-package-tree/read-package-tree-tests.ts
@@ -1,4 +1,4 @@
-import * as readPackageTree from "read-package-tree";
+import readPackageTree = require("read-package-tree");
readPackageTree("../", (error, data) => {
// done
diff --git a/types/redux-localstorage-debounce/redux-localstorage-debounce-tests.ts b/types/redux-localstorage-debounce/redux-localstorage-debounce-tests.ts
index 24b5a32528..db408c018c 100644
--- a/types/redux-localstorage-debounce/redux-localstorage-debounce-tests.ts
+++ b/types/redux-localstorage-debounce/redux-localstorage-debounce-tests.ts
@@ -2,7 +2,7 @@ import { compose } from "redux";
import {
default as persistState
} from "redux-localstorage";
-import * as adapter from "redux-localstorage/lib/adapters/localStorage";
+import adapter = require("redux-localstorage/lib/adapters/localStorage");
import { default as debounce } from "redux-localstorage-debounce";
const storageWait = compose(
diff --git a/types/redux-localstorage-filter/redux-localstorage-filter-tests.ts b/types/redux-localstorage-filter/redux-localstorage-filter-tests.ts
index 5569b22345..f45ee7157e 100644
--- a/types/redux-localstorage-filter/redux-localstorage-filter-tests.ts
+++ b/types/redux-localstorage-filter/redux-localstorage-filter-tests.ts
@@ -2,7 +2,7 @@ import { compose } from "redux";
import {
default as persistState
} from "redux-localstorage";
-import * as adapter from "redux-localstorage/lib/adapters/localStorage";
+import adapter = require("redux-localstorage/lib/adapters/localStorage");
import { default as filter } from "redux-localstorage-filter";
const storageSingle = compose(
diff --git a/types/redux-localstorage/redux-localstorage-tests.ts b/types/redux-localstorage/redux-localstorage-tests.ts
index 17f453423a..bfa76f1ea3 100644
--- a/types/redux-localstorage/redux-localstorage-tests.ts
+++ b/types/redux-localstorage/redux-localstorage-tests.ts
@@ -5,9 +5,9 @@ import {
transformState,
actionTypes
} from "redux-localstorage";
-import * as adapterAsyncStorage from "redux-localstorage/lib/adapters/AsyncStorage";
-import * as adapterLocalStorage from "redux-localstorage/lib/adapters/localStorage";
-import * as adapterSessionStorage from "redux-localstorage/lib/adapters/sessionStorage";
+import adapterAsyncStorage = require("redux-localstorage/lib/adapters/AsyncStorage");
+import adapterLocalStorage = require("redux-localstorage/lib/adapters/localStorage");
+import adapterSessionStorage = require("redux-localstorage/lib/adapters/sessionStorage");
const AsyncStorage: any = {};
diff --git a/types/redux-socket.io/redux-socket.io-tests.ts b/types/redux-socket.io/redux-socket.io-tests.ts
index f67a86393a..6c5a64e5a5 100644
--- a/types/redux-socket.io/redux-socket.io-tests.ts
+++ b/types/redux-socket.io/redux-socket.io-tests.ts
@@ -1,4 +1,4 @@
-import * as ioclient from 'socket.io-client';
+import ioclient = require('socket.io-client');
import createSocketIoMiddleware from 'redux-socket.io';
import { Action } from 'redux';
diff --git a/types/relateurl/relateurl-tests.ts b/types/relateurl/relateurl-tests.ts
index 7285dca153..03a184ec38 100644
--- a/types/relateurl/relateurl-tests.ts
+++ b/types/relateurl/relateurl-tests.ts
@@ -1,5 +1,4 @@
-
-import * as RelateUrl from 'relateurl';
+import RelateUrl = require('relateurl');
var from = "http://www.domain.com/asdf/";
var to = "http://www.domain.com/asdf/asdf";
diff --git a/types/resolve-from/resolve-from-tests.ts b/types/resolve-from/resolve-from-tests.ts
index d4de48146a..ddbc5bdbea 100644
--- a/types/resolve-from/resolve-from-tests.ts
+++ b/types/resolve-from/resolve-from-tests.ts
@@ -1,11 +1,7 @@
import resolveFrom = require("resolve-from");
-import resolveFrom1 = require('resolve-from');
-import * as resolveFrom2 from 'resolve-from';
-
let from: string;
let moduleId: string;
let result: string;
-result = resolveFrom1(from, moduleId);
-result = resolveFrom2(from, moduleId);
+result = resolveFrom(from, moduleId);
diff --git a/types/route-parser/route-parser-tests.ts b/types/route-parser/route-parser-tests.ts
index e521008291..66be438592 100644
--- a/types/route-parser/route-parser-tests.ts
+++ b/types/route-parser/route-parser-tests.ts
@@ -1,4 +1,4 @@
-import * as Route from 'route-parser';
+import Route = require('route-parser');
const route = new Route('/users/:id');
const matched = route.match('/users/42'); // => { id: '42' }
diff --git a/types/rss/rss-tests.ts b/types/rss/rss-tests.ts
index e73f786a18..3dc5574c1c 100644
--- a/types/rss/rss-tests.ts
+++ b/types/rss/rss-tests.ts
@@ -1,5 +1,3 @@
-
-
// this test is copied from https://github.com/dylang/node-rss
// it basically:
//
@@ -7,7 +5,7 @@
// * add an item to it
// * then generates XML string
-import * as RSS from 'rss';
+import RSS = require('rss');
var feed = new RSS({
title: 'title',
diff --git a/types/rwlock/rwlock-tests.ts b/types/rwlock/rwlock-tests.ts
index 8e2f210164..ee869d0ec6 100644
--- a/types/rwlock/rwlock-tests.ts
+++ b/types/rwlock/rwlock-tests.ts
@@ -1,5 +1,5 @@
// Original test file https://github.com/71104/rwlock/blob/master/test/all.js
-import * as ReadWriteLock from 'rwlock';
+import ReadWriteLock = require('rwlock');
const lock = new ReadWriteLock();
lock.readLock((release) => {
diff --git a/types/sanitize-html/sanitize-html-tests.ts b/types/sanitize-html/sanitize-html-tests.ts
index 31efb0395f..cc43d64fcb 100644
--- a/types/sanitize-html/sanitize-html-tests.ts
+++ b/types/sanitize-html/sanitize-html-tests.ts
@@ -1,5 +1,4 @@
-
-import * as sanitize from 'sanitize-html';
+import sanitize = require('sanitize-html');
let options: sanitize.IOptions = {
allowedTags: sanitize.defaults.allowedTags.concat('h1', 'h2', 'img'),
@@ -7,7 +6,7 @@ let options: sanitize.IOptions = {
'a': sanitize.defaults.allowedAttributes['a'].concat('rel'),
'img': ['src', 'height', 'width', 'alt']
},
- transformTags: {
+ transformTags: {
'a': sanitize.simpleTransform('a', { 'rel': 'nofollow' }),
'img': (tagName: string, attribs: sanitize.Attributes) => {
let img = { tagName, attribs };
diff --git a/types/saywhen/saywhen-tests.ts b/types/saywhen/saywhen-tests.ts
index a1a02d6178..a253308156 100644
--- a/types/saywhen/saywhen-tests.ts
+++ b/types/saywhen/saywhen-tests.ts
@@ -1,4 +1,4 @@
-import * as when from 'saywhen';
+import when = require('saywhen');
when(jasmine.createSpy('test')); // $ExpectType CallHandler
when(jasmine.createSpy('test')).isCalled; // $ExpectType Proxy
diff --git a/types/scriptjs/scriptjs-tests.ts b/types/scriptjs/scriptjs-tests.ts
index c82464f172..a73e40314a 100644
--- a/types/scriptjs/scriptjs-tests.ts
+++ b/types/scriptjs/scriptjs-tests.ts
@@ -1,4 +1,4 @@
-import * as $script from 'scriptjs';
+import $script = require('scriptjs');
const callback = (): void => console.log('done');
diff --git a/types/scroll-into-view/scroll-into-view-tests.ts b/types/scroll-into-view/scroll-into-view-tests.ts
index 5cb274bc15..bd50abb011 100644
--- a/types/scroll-into-view/scroll-into-view-tests.ts
+++ b/types/scroll-into-view/scroll-into-view-tests.ts
@@ -1,4 +1,4 @@
-import * as scrollIntoView from "scroll-into-view"
+import scrollIntoView = require("scroll-into-view");
var someElement: HTMLElement
scrollIntoView(someElement);
diff --git a/types/seamless-immutable/seamless-immutable-tests.ts b/types/seamless-immutable/seamless-immutable-tests.ts
index 528cd6cce2..ddec87e81d 100644
--- a/types/seamless-immutable/seamless-immutable-tests.ts
+++ b/types/seamless-immutable/seamless-immutable-tests.ts
@@ -1,4 +1,4 @@
-import * as Immutable from 'seamless-immutable';
+import Immutable = require('seamless-immutable');
// Test types
diff --git a/types/selectables/selectables-tests.ts b/types/selectables/selectables-tests.ts
index 595f2ca738..960573033b 100644
--- a/types/selectables/selectables-tests.ts
+++ b/types/selectables/selectables-tests.ts
@@ -1,4 +1,4 @@
-import * as Selectables from "selectables";
+import Selectables = require("selectables");
const dr = new Selectables({
zone: '#div',
diff --git a/types/seneca/seneca-tests.ts b/types/seneca/seneca-tests.ts
index ea10180074..6ff0331ff6 100644
--- a/types/seneca/seneca-tests.ts
+++ b/types/seneca/seneca-tests.ts
@@ -2,7 +2,7 @@
* This file contains all of the example code that was on http://senecajs.org as of Mon June 16, 2016.
*/
-import * as SENECA from 'seneca'
+import SENECA = require('seneca');
var seneca: SENECA.Instance = SENECA()
seneca.add({ cmd: 'salestax' }, function (args, callback) {
diff --git a/types/serialize-javascript/serialize-javascript-tests.ts b/types/serialize-javascript/serialize-javascript-tests.ts
index b4c79f6a7c..357607daba 100644
--- a/types/serialize-javascript/serialize-javascript-tests.ts
+++ b/types/serialize-javascript/serialize-javascript-tests.ts
@@ -1,4 +1,4 @@
-import * as serialize from "serialize-javascript";
+import serialize = require("serialize-javascript");
const obj: any = {
str: "string",
diff --git a/types/sheetify/sheetify-tests.ts b/types/sheetify/sheetify-tests.ts
index eba3a63336..b6704ed2e7 100644
--- a/types/sheetify/sheetify-tests.ts
+++ b/types/sheetify/sheetify-tests.ts
@@ -1,4 +1,4 @@
-import * as sheetify from 'sheetify';
+import sheetify = require('sheetify');
function done1(err: Error, css: string, prefix: string) {}
function done2(err: Error, css: string) {}
diff --git a/types/shell-escape/shell-escape-tests.ts b/types/shell-escape/shell-escape-tests.ts
index ac3906be19..3cac57b81a 100644
--- a/types/shell-escape/shell-escape-tests.ts
+++ b/types/shell-escape/shell-escape-tests.ts
@@ -1,4 +1,4 @@
-import * as shellEscape from 'shell-escape';
+import shellEscape = require('shell-escape');
() => {
const stringRes = shellEscape(['cp', '-r', 'src/', 'dest/']);
diff --git a/types/spark-md5/spark-md5-tests.ts b/types/spark-md5/spark-md5-tests.ts
index bc81f715f1..0a6c929a29 100644
--- a/types/spark-md5/spark-md5-tests.ts
+++ b/types/spark-md5/spark-md5-tests.ts
@@ -1,4 +1,4 @@
-import * as SparkMD5 from "spark-md5";
+import SparkMD5 = require("spark-md5");
SparkMD5.hash('Hi there');
SparkMD5.hash('Hi there', true);
diff --git a/types/stale-lru-cache/stale-lru-cache-tests.ts b/types/stale-lru-cache/stale-lru-cache-tests.ts
index 8d3c47562f..4b597f545d 100644
--- a/types/stale-lru-cache/stale-lru-cache-tests.ts
+++ b/types/stale-lru-cache/stale-lru-cache-tests.ts
@@ -1,4 +1,4 @@
-import * as Cache from 'stale-lru-cache';
+import Cache = require('stale-lru-cache');
const cache = new Cache({
maxSize: 100,
diff --git a/types/stemmer/stemmer-tests.ts b/types/stemmer/stemmer-tests.ts
index b5ed8daec4..db9f19d996 100644
--- a/types/stemmer/stemmer-tests.ts
+++ b/types/stemmer/stemmer-tests.ts
@@ -1,3 +1,3 @@
-import * as stemmer from 'stemmer';
+import stemmer = require('stemmer');
stemmer('Working'); // $ExpectType string
diff --git a/types/strftime/strftime-tests.ts b/types/strftime/strftime-tests.ts
index 2c07e8ad5f..7ecbfaf2fe 100644
--- a/types/strftime/strftime-tests.ts
+++ b/types/strftime/strftime-tests.ts
@@ -1,4 +1,4 @@
-import * as strftime from "strftime";
+import strftime = require("strftime");
strftime('%B %d, %Y %H:%M:%S');
strftime('%F %T', new Date(1307472705067));
diff --git a/types/string-template/string-template-tests.ts b/types/string-template/string-template-tests.ts
index 8ac76014c1..226f042287 100644
--- a/types/string-template/string-template-tests.ts
+++ b/types/string-template/string-template-tests.ts
@@ -1,5 +1,5 @@
-import * as format from "string-template";
-import * as compile from "string-template/compile";
+import format = require("string-template");
+import compile = require("string-template/compile");
// Format tests
{
diff --git a/types/stringify-object/stringify-object-tests.ts b/types/stringify-object/stringify-object-tests.ts
index a00be6f1c0..7216ae3792 100644
--- a/types/stringify-object/stringify-object-tests.ts
+++ b/types/stringify-object/stringify-object-tests.ts
@@ -1,4 +1,4 @@
-import * as stringifyObject from 'stringify-object';
+import stringifyObject = require('stringify-object');
stringifyObject({ a: 1, b: 2, c: 3 });
diff --git a/types/strip-json-comments/strip-json-comments-tests.ts b/types/strip-json-comments/strip-json-comments-tests.ts
index f71f62cf0f..188248a285 100644
--- a/types/strip-json-comments/strip-json-comments-tests.ts
+++ b/types/strip-json-comments/strip-json-comments-tests.ts
@@ -1,9 +1,4 @@
-// Type definitions for strip-json-comments
-// Project: https://github.com/sindresorhus/strip-json-comments
-// Definitions by: Dylan R. E. Moonfire
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-import * as stripJsonComments from "strip-json-comments";
+import stripJsonComments = require("strip-json-comments");
const json = '{/*rainbows*/"unicorn":"cake"}';
diff --git a/types/testingbot-api/testingbot-api-tests.ts b/types/testingbot-api/testingbot-api-tests.ts
index 2b8cd1f655..39ac0d8f81 100644
--- a/types/testingbot-api/testingbot-api-tests.ts
+++ b/types/testingbot-api/testingbot-api-tests.ts
@@ -1,4 +1,4 @@
-import * as TestingBot from 'testingbot-api';
+import TestingBot = require('testingbot-api');
const sessionId = '123';
diff --git a/types/timer-machine/timer-machine-tests.ts b/types/timer-machine/timer-machine-tests.ts
index 5163fd9af8..e062634367 100644
--- a/types/timer-machine/timer-machine-tests.ts
+++ b/types/timer-machine/timer-machine-tests.ts
@@ -1,4 +1,4 @@
-import * as Timer from "timer-machine";
+import Timer = require("timer-machine");
let myTimer = new Timer();
diff --git a/types/to-markdown/to-markdown-tests.ts b/types/to-markdown/to-markdown-tests.ts
index 6c21bf1740..f50f348bc8 100644
--- a/types/to-markdown/to-markdown-tests.ts
+++ b/types/to-markdown/to-markdown-tests.ts
@@ -1,4 +1,4 @@
-import * as toMarkdown from 'to-markdown';
+import toMarkdown = require('to-markdown');
// toMarkdown()
toMarkdown(`
diff --git a/types/tocktimer/tocktimer-tests.ts b/types/tocktimer/tocktimer-tests.ts
index 85f911b8a9..e2d7cb0bf5 100644
--- a/types/tocktimer/tocktimer-tests.ts
+++ b/types/tocktimer/tocktimer-tests.ts
@@ -1,4 +1,4 @@
-import * as tock from 'tocktimer';
+import tock = require('tocktimer');
let timer: tock.Tock;
diff --git a/types/twix/twix-tests.ts b/types/twix/twix-tests.ts
index e45d706635..dc4ba2c878 100644
--- a/types/twix/twix-tests.ts
+++ b/types/twix/twix-tests.ts
@@ -1,6 +1,4 @@
-
-
-import * as moment from 'moment';
+import moment = require('moment');
var someMoment = moment("20111031", "YYYYMMDD");
var otherMoment = moment("20120620", "YYYYMMDD");
diff --git a/types/tz-format/tz-format-tests.ts b/types/tz-format/tz-format-tests.ts
index 729505ab57..7049fbd7f6 100644
--- a/types/tz-format/tz-format-tests.ts
+++ b/types/tz-format/tz-format-tests.ts
@@ -1,4 +1,4 @@
-import * as format from 'tz-format';
+import format = require('tz-format');
format();
format(1);
diff --git a/types/uid-safe/uid-safe-tests.ts b/types/uid-safe/uid-safe-tests.ts
index 6af969ce60..6eb4bc274a 100644
--- a/types/uid-safe/uid-safe-tests.ts
+++ b/types/uid-safe/uid-safe-tests.ts
@@ -1,12 +1,12 @@
-import * as uid from 'uid-safe';
+import uid = require('uid-safe');
uid(18, function (err, string) {
if (err) throw err
- // do something with the string
+ // do something with the string
});
uid(18).then(function (string) {
- // do something with the string
+ // do something with the string
})
var string = uid.sync(18);
diff --git a/types/ultra-strftime/ultra-strftime-tests.ts b/types/ultra-strftime/ultra-strftime-tests.ts
index 4439425663..b45cfb7fd8 100644
--- a/types/ultra-strftime/ultra-strftime-tests.ts
+++ b/types/ultra-strftime/ultra-strftime-tests.ts
@@ -1,4 +1,4 @@
-import * as strftime from "ultra-strftime";
+import strftime = require("ultra-strftime");
const it_IT = {
days: ['domenica', 'lunedi', 'martedi', 'mercoledi', 'giovedi', 'venerdi', 'sabato'],
diff --git a/types/undertaker-registry/undertaker-registry-tests.ts b/types/undertaker-registry/undertaker-registry-tests.ts
index 4a6201c14f..6c1e58948a 100644
--- a/types/undertaker-registry/undertaker-registry-tests.ts
+++ b/types/undertaker-registry/undertaker-registry-tests.ts
@@ -1,4 +1,4 @@
-import * as UndertakerRegistry from "undertaker-registry";
+import UndertakerRegistry = require("undertaker-registry");
const ArgTask = (firstArg: string, secondArg: number) => {
// Task
diff --git a/types/uniqid/uniqid-tests.ts b/types/uniqid/uniqid-tests.ts
index f0f56aa2fd..b2a195ea79 100644
--- a/types/uniqid/uniqid-tests.ts
+++ b/types/uniqid/uniqid-tests.ts
@@ -1,4 +1,4 @@
-import * as uniqid from "uniqid";
+import uniqid = require("uniqid");
const uniqueID = uniqid("123");
const processString = uniqid.process("123");
diff --git a/types/upng-js/tsconfig.json b/types/upng-js/tsconfig.json
index e6499c55f2..ebc1982388 100644
--- a/types/upng-js/tsconfig.json
+++ b/types/upng-js/tsconfig.json
@@ -14,6 +14,7 @@
"types": [],
"noEmit": true,
"forceConsistentCasingInFileNames": true,
+ "esModuleInterop": true,
"strictFunctionTypes": true
},
"files": [
diff --git a/types/uppercamelcase/uppercamelcase-tests.ts b/types/uppercamelcase/uppercamelcase-tests.ts
index fbb178c2fa..9af952ccda 100644
--- a/types/uppercamelcase/uppercamelcase-tests.ts
+++ b/types/uppercamelcase/uppercamelcase-tests.ts
@@ -1,4 +1,4 @@
-import * as upperCamelCase from 'uppercamelcase';
+import upperCamelCase = require('uppercamelcase');
upperCamelCase('foo-bar');
upperCamelCase('foo_bar');
diff --git a/types/url-join/url-join-tests.ts b/types/url-join/url-join-tests.ts
index 2b512bc6d4..5a4afd6b80 100644
--- a/types/url-join/url-join-tests.ts
+++ b/types/url-join/url-join-tests.ts
@@ -1,5 +1,5 @@
import urljoin = require("url-join");
-import * as urljoin2 from "url-join";
+import urljoin2 = require("url-join");
const s: string = urljoin("foo", "bar", "baz");
const s2: string = urljoin2("foo", "bar", "baz");
diff --git a/types/url-metadata/url-metadata-tests.ts b/types/url-metadata/url-metadata-tests.ts
index ab45090783..6024c5a0e7 100644
--- a/types/url-metadata/url-metadata-tests.ts
+++ b/types/url-metadata/url-metadata-tests.ts
@@ -1,4 +1,4 @@
-import * as urlMetadata from "url-metadata";
+import urlMetadata = require("url-metadata");
const opts: urlMetadata.Options = {
userAgent: "url-metadata-test",
diff --git a/types/vali-date/vali-date-tests.ts b/types/vali-date/vali-date-tests.ts
index 85a3e39bc5..53fd102a15 100644
--- a/types/vali-date/vali-date-tests.ts
+++ b/types/vali-date/vali-date-tests.ts
@@ -1,4 +1,4 @@
-import * as valiDate from 'vali-date';
+import valiDate = require('vali-date');
valiDate('foo');
valiDate('bar');
diff --git a/types/validatorjs/validatorjs-tests.ts b/types/validatorjs/validatorjs-tests.ts
index c8094936b7..4eb24ed6bd 100644
--- a/types/validatorjs/validatorjs-tests.ts
+++ b/types/validatorjs/validatorjs-tests.ts
@@ -1,4 +1,4 @@
-import * as Validator from "validatorjs"
+import Validator = require("validatorjs");
var rules: any = {
foo: "required"
diff --git a/types/vertx3-eventbus-client/vertx3-eventbus-client-tests.ts b/types/vertx3-eventbus-client/vertx3-eventbus-client-tests.ts
index e4b7ed7e67..377c075879 100644
--- a/types/vertx3-eventbus-client/vertx3-eventbus-client-tests.ts
+++ b/types/vertx3-eventbus-client/vertx3-eventbus-client-tests.ts
@@ -1,3 +1,3 @@
-import * as EventBus from "vertx3-eventbus-client";
+import EventBus = require("vertx3-eventbus-client");
const eb = new EventBus("http://localhost:9999");
diff --git a/types/video.js/video.js-tests.ts b/types/video.js/video.js-tests.ts
index 145be6c711..287b804e14 100644
--- a/types/video.js/video.js-tests.ts
+++ b/types/video.js/video.js-tests.ts
@@ -1,6 +1,4 @@
-// Tests for Video.js API
-
-import * as videojs from 'video.js';
+import videojs = require('video.js');
videojs("example_video_1").ready(function() {
// EXAMPLE: Start playing the video.
diff --git a/types/virtual-keyboard/virtual-keyboard-tests.ts b/types/virtual-keyboard/virtual-keyboard-tests.ts
index 84e3c9ed3c..91deb9a7c9 100644
--- a/types/virtual-keyboard/virtual-keyboard-tests.ts
+++ b/types/virtual-keyboard/virtual-keyboard-tests.ts
@@ -1,4 +1,4 @@
-import * as jQuery from "jquery";
+import jQuery = require("jquery");
import { KeyboardOptions, NavigateOptions } from "virtual-keyboard";
const kbOptions: KeyboardOptions = {
diff --git a/types/wampy/wampy-tests.ts b/types/wampy/wampy-tests.ts
index 27dd90ed73..1d999fc7c6 100644
--- a/types/wampy/wampy-tests.ts
+++ b/types/wampy/wampy-tests.ts
@@ -1,4 +1,4 @@
-import * as Wampy from 'wampy';
+import Wampy = require('wampy');
declare var console: { log(...args: any[]): void };
let ws = new Wampy('http://wamp.router.url', {realm: 'WAMPRealm'});
diff --git a/types/warning/warning-tests.ts b/types/warning/warning-tests.ts
index 7079e127f2..f85e3159c5 100644
--- a/types/warning/warning-tests.ts
+++ b/types/warning/warning-tests.ts
@@ -1,4 +1,4 @@
-import * as warning from "warning";
+import warning = require("warning");
// this will pass without warning.
warning(true, 'Warning, read all about it');
diff --git a/types/write-json-file/write-json-file-tests.ts b/types/write-json-file/write-json-file-tests.ts
index 7354dfc17f..bad3b1a5a1 100644
--- a/types/write-json-file/write-json-file-tests.ts
+++ b/types/write-json-file/write-json-file-tests.ts
@@ -1,4 +1,4 @@
-import * as write from 'write-json-file';
+import write = require('write-json-file');
// Basic
write('foo.json', {foo: true}).then(() => { });
diff --git a/types/xtend/xtend-tests.ts b/types/xtend/xtend-tests.ts
index 12ad82a1b0..5f72688fdb 100644
--- a/types/xtend/xtend-tests.ts
+++ b/types/xtend/xtend-tests.ts
@@ -1,4 +1,4 @@
-import * as xtend from "xtend";
+import xtend = require("xtend");
interface Target {
hellow: string;
diff --git a/types/yayson/yayson-tests.ts b/types/yayson/yayson-tests.ts
index 4e8b9c7d36..4945c03737 100644
--- a/types/yayson/yayson-tests.ts
+++ b/types/yayson/yayson-tests.ts
@@ -1,4 +1,4 @@
-import * as Yayson from "yayson";
+import Yayson = require("yayson");
const yayson = Yayson({ adapter: 'default' }) || Yayson({ adapter: 'sequelize' }) || Yayson();
const Adapter = yayson.Adapter;
diff --git a/types/zen-observable/zen-observable-tests.ts b/types/zen-observable/zen-observable-tests.ts
index b4da077311..b06e7cb512 100644
--- a/types/zen-observable/zen-observable-tests.ts
+++ b/types/zen-observable/zen-observable-tests.ts
@@ -1,4 +1,4 @@
-import * as Observable from 'zen-observable';
+import Observable = require('zen-observable');
function assert(val: boolean) {
if (!val) {
diff --git a/types/zen-push/zen-push-tests.ts b/types/zen-push/zen-push-tests.ts
index 79abc517e8..70feab99f6 100644
--- a/types/zen-push/zen-push-tests.ts
+++ b/types/zen-push/zen-push-tests.ts
@@ -1,5 +1,5 @@
import PushStream from 'zen-push';
-import * as Observable from 'zen-observable';
+import Observable = require('zen-observable');
function assert(val: boolean) {
if (!val) {