diff --git a/frontend/src/components/App/AccountMenu.js b/frontend/src/components/App/AccountMenu.js
index 99ab9301..f23cda61 100644
--- a/frontend/src/components/App/AccountMenu.js
+++ b/frontend/src/components/App/AccountMenu.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 import onClickOutsideAddon from 'react-onclickoutside'
 
diff --git a/frontend/src/components/App/LoginForm.js b/frontend/src/components/App/LoginForm.js
index fee8bab8..0813c1c0 100644
--- a/frontend/src/components/App/LoginForm.js
+++ b/frontend/src/components/App/LoginForm.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 import onClickOutsideAddon from 'react-onclickoutside'
 
diff --git a/frontend/src/components/App/MobileHeader.js b/frontend/src/components/App/MobileHeader.js
index 16821853..a9acce37 100644
--- a/frontend/src/components/App/MobileHeader.js
+++ b/frontend/src/components/App/MobileHeader.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { Link } from 'react-router'
 
 import Sprite from '../common/Sprite'
diff --git a/frontend/src/components/App/NotificationIcon.js b/frontend/src/components/App/NotificationIcon.js
index 3f9c8980..36b86b72 100644
--- a/frontend/src/components/App/NotificationIcon.js
+++ b/frontend/src/components/App/NotificationIcon.js
@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class NotificationIcon extends Component {
 
diff --git a/frontend/src/components/App/Toast.js b/frontend/src/components/App/Toast.js
index 4d27f007..7e53442d 100644
--- a/frontend/src/components/App/Toast.js
+++ b/frontend/src/components/App/Toast.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class Toast extends Component {
   static propTypes = {
diff --git a/frontend/src/components/App/UpperLeftUI.js b/frontend/src/components/App/UpperLeftUI.js
index 427e63d8..cbead88e 100644
--- a/frontend/src/components/App/UpperLeftUI.js
+++ b/frontend/src/components/App/UpperLeftUI.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { Link } from 'react-router'
 
 class UpperLeftUI extends Component {
diff --git a/frontend/src/components/App/UpperRightUI.js b/frontend/src/components/App/UpperRightUI.js
index e8494b54..d1e53652 100644
--- a/frontend/src/components/App/UpperRightUI.js
+++ b/frontend/src/components/App/UpperRightUI.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 import AccountMenu from './AccountMenu'
 import LoginForm from './LoginForm'
diff --git a/frontend/src/components/App/index.js b/frontend/src/components/App/index.js
index 0c6bd403..ed24e9d1 100644
--- a/frontend/src/components/App/index.js
+++ b/frontend/src/components/App/index.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 import MobileHeader from './MobileHeader'
 import UpperLeftUI from './UpperLeftUI'
diff --git a/frontend/src/components/MapView/ImportDialogBox.js b/frontend/src/components/MapView/ImportDialogBox.js
index 9a9c777b..e9e0539e 100644
--- a/frontend/src/components/MapView/ImportDialogBox.js
+++ b/frontend/src/components/MapView/ImportDialogBox.js
@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import Dropzone from 'react-dropzone'
 
 class ImportDialogBox extends Component {
diff --git a/frontend/src/components/MapView/Instructions.js b/frontend/src/components/MapView/Instructions.js
index 66331fa1..7fc1358f 100644
--- a/frontend/src/components/MapView/Instructions.js
+++ b/frontend/src/components/MapView/Instructions.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class Instructions extends Component {
 
diff --git a/frontend/src/components/MapView/MapChat/NewMessage.js b/frontend/src/components/MapView/MapChat/NewMessage.js
index 2046ac9f..b5aee5fa 100644
--- a/frontend/src/components/MapView/MapChat/NewMessage.js
+++ b/frontend/src/components/MapView/MapChat/NewMessage.js
@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { Emoji, Picker } from 'emoji-mart'
 
 class NewMessage extends Component {
diff --git a/frontend/src/components/MapView/MapChat/Participant.js b/frontend/src/components/MapView/MapChat/Participant.js
index 0fede6aa..b064ae28 100644
--- a/frontend/src/components/MapView/MapChat/Participant.js
+++ b/frontend/src/components/MapView/MapChat/Participant.js
@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class Participant extends Component {
   render() {
diff --git a/frontend/src/components/MapView/MapChat/index.js b/frontend/src/components/MapView/MapChat/index.js
index 64b7b10e..4f702125 100644
--- a/frontend/src/components/MapView/MapChat/index.js
+++ b/frontend/src/components/MapView/MapChat/index.js
@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import Unread from './Unread'
 import Participant from './Participant'
 import Message from './Message'
diff --git a/frontend/src/components/MapView/MapInfoBox.js b/frontend/src/components/MapView/MapInfoBox.js
index 7f64da0f..43d56c13 100644
--- a/frontend/src/components/MapView/MapInfoBox.js
+++ b/frontend/src/components/MapView/MapInfoBox.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class MapInfoBox extends Component {
   static propTypes = {
diff --git a/frontend/src/components/MapView/index.js b/frontend/src/components/MapView/index.js
index 8a9901a3..fe8c23b1 100644
--- a/frontend/src/components/MapView/index.js
+++ b/frontend/src/components/MapView/index.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 import DataVis from '../common/DataVis'
 import UpperOptions from '../common/UpperOptions'
diff --git a/frontend/src/components/Maps/Header.js b/frontend/src/components/Maps/Header.js
index 39fa6c62..2168e0c0 100644
--- a/frontend/src/components/Maps/Header.js
+++ b/frontend/src/components/Maps/Header.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { Link } from 'react-router'
 import _ from 'lodash'
 
diff --git a/frontend/src/components/Maps/MapCard.js b/frontend/src/components/Maps/MapCard.js
index bd1b137c..a56e9ba5 100644
--- a/frontend/src/components/Maps/MapCard.js
+++ b/frontend/src/components/Maps/MapCard.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { Link } from 'react-router'
 import { find, values } from 'lodash'
 import Util from '../../Metamaps/Util'
diff --git a/frontend/src/components/Maps/MapperCard.js b/frontend/src/components/Maps/MapperCard.js
index dbb06cbc..c08d146e 100644
--- a/frontend/src/components/Maps/MapperCard.js
+++ b/frontend/src/components/Maps/MapperCard.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class MapperCard extends Component {
   render = () => {
diff --git a/frontend/src/components/Maps/index.js b/frontend/src/components/Maps/index.js
index 6412a33c..081515fe 100644
--- a/frontend/src/components/Maps/index.js
+++ b/frontend/src/components/Maps/index.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { throttle } from 'lodash'
 import Header from './Header'
 import MapperCard from './MapperCard'
diff --git a/frontend/src/components/MetacodeSelect.js b/frontend/src/components/MetacodeSelect.js
index 68da09e8..3f4146c7 100644
--- a/frontend/src/components/MetacodeSelect.js
+++ b/frontend/src/components/MetacodeSelect.js
@@ -8,7 +8,8 @@
  * passes that metacode's id to the callback.
  */
 
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class MetacodeSelect extends Component {
   render = () => {
diff --git a/frontend/src/components/TopicCard/Attachments.js b/frontend/src/components/TopicCard/Attachments.js
index 6f26aed2..fcb5bea8 100644
--- a/frontend/src/components/TopicCard/Attachments.js
+++ b/frontend/src/components/TopicCard/Attachments.js
@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 import EmbedlyLink from './EmbedlyLink'
 
diff --git a/frontend/src/components/TopicCard/Desc.js b/frontend/src/components/TopicCard/Desc.js
index c94f30fb..711dcc5e 100644
--- a/frontend/src/components/TopicCard/Desc.js
+++ b/frontend/src/components/TopicCard/Desc.js
@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { RIETextArea } from 'riek'
 import Util from '../../Metamaps/Util'
 
diff --git a/frontend/src/components/TopicCard/EmbedlyLink/Card.js b/frontend/src/components/TopicCard/EmbedlyLink/Card.js
index 6d251310..da7474cb 100644
--- a/frontend/src/components/TopicCard/EmbedlyLink/Card.js
+++ b/frontend/src/components/TopicCard/EmbedlyLink/Card.js
@@ -1,5 +1,6 @@
 /* global $, embedly */
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class EmbedlyCard extends Component {
   constructor(props) {
diff --git a/frontend/src/components/TopicCard/EmbedlyLink/index.js b/frontend/src/components/TopicCard/EmbedlyLink/index.js
index c2413930..0f6df211 100644
--- a/frontend/src/components/TopicCard/EmbedlyLink/index.js
+++ b/frontend/src/components/TopicCard/EmbedlyLink/index.js
@@ -1,5 +1,6 @@
 /* global embedly */
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 import Card from './Card'
 
diff --git a/frontend/src/components/TopicCard/Follow.js b/frontend/src/components/TopicCard/Follow.js
index 653d8b18..2b4c8162 100644
--- a/frontend/src/components/TopicCard/Follow.js
+++ b/frontend/src/components/TopicCard/Follow.js
@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class Follow extends Component {
   render = () => {
diff --git a/frontend/src/components/TopicCard/Links.js b/frontend/src/components/TopicCard/Links.js
index accf2bfa..a20e637c 100644
--- a/frontend/src/components/TopicCard/Links.js
+++ b/frontend/src/components/TopicCard/Links.js
@@ -1,6 +1,7 @@
 /* global $ */
 
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { Link } from 'react-router'
 
 import MetacodeSelect from '../MetacodeSelect'
diff --git a/frontend/src/components/TopicCard/Permission.js b/frontend/src/components/TopicCard/Permission.js
index bceb2d4c..27ebf2a5 100644
--- a/frontend/src/components/TopicCard/Permission.js
+++ b/frontend/src/components/TopicCard/Permission.js
@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 import onClickOutsideAddon from 'react-onclickoutside'
 
diff --git a/frontend/src/components/TopicCard/Title.js b/frontend/src/components/TopicCard/Title.js
index 1eca527b..4ebdeedd 100644
--- a/frontend/src/components/TopicCard/Title.js
+++ b/frontend/src/components/TopicCard/Title.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import { RIETextArea } from 'riek'
 
 const maxTitleLength = 140
diff --git a/frontend/src/components/TopicCard/index.js b/frontend/src/components/TopicCard/index.js
index e3297dad..0b85e3de 100644
--- a/frontend/src/components/TopicCard/index.js
+++ b/frontend/src/components/TopicCard/index.js
@@ -1,4 +1,5 @@
-import React, { PropTypes, Component } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 import Draggable from 'react-draggable'
 
 import Title from './Title'
diff --git a/frontend/src/components/TopicView/index.js b/frontend/src/components/TopicView/index.js
index edd7b92e..5ca9a050 100644
--- a/frontend/src/components/TopicView/index.js
+++ b/frontend/src/components/TopicView/index.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 import DataVis from '../common/DataVis'
 import UpperOptions from '../common/UpperOptions'
diff --git a/frontend/src/components/common/DataVis.js b/frontend/src/components/common/DataVis.js
index f5f370d4..f39bdd7f 100644
--- a/frontend/src/components/common/DataVis.js
+++ b/frontend/src/components/common/DataVis.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 class DataVis extends Component {
   static propTypes = {
diff --git a/frontend/src/components/common/FilterBox.js b/frontend/src/components/common/FilterBox.js
index 01343d3c..dc583159 100644
--- a/frontend/src/components/common/FilterBox.js
+++ b/frontend/src/components/common/FilterBox.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 import onClickOutsideAddon from 'react-onclickoutside'
 
diff --git a/frontend/src/components/common/InfoAndHelp.js b/frontend/src/components/common/InfoAndHelp.js
index fe298691..8a4edf25 100644
--- a/frontend/src/components/common/InfoAndHelp.js
+++ b/frontend/src/components/common/InfoAndHelp.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 import MapInfoBox from '../MapView/MapInfoBox'
 
diff --git a/frontend/src/components/common/Sprite.js b/frontend/src/components/common/Sprite.js
index 7283b421..44859403 100644
--- a/frontend/src/components/common/Sprite.js
+++ b/frontend/src/components/common/Sprite.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 export default class Sprite extends Component {
   static propTypes = {
diff --git a/frontend/src/components/common/UpperOptions.js b/frontend/src/components/common/UpperOptions.js
index d17214ee..5108eab3 100644
--- a/frontend/src/components/common/UpperOptions.js
+++ b/frontend/src/components/common/UpperOptions.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 import FilterBox from '../common/FilterBox'
 
diff --git a/frontend/src/components/common/VisualizationControls.js b/frontend/src/components/common/VisualizationControls.js
index 0b45f827..b3cf5665 100644
--- a/frontend/src/components/common/VisualizationControls.js
+++ b/frontend/src/components/common/VisualizationControls.js
@@ -1,4 +1,5 @@
-import React, { Component, PropTypes } from 'react'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
 
 export default class VisualizationControls extends Component {
   static propTypes = {
diff --git a/frontend/test_support/dom.js b/frontend/test_support/dom.js
index 5dd4a9ef..0380a338 100644
--- a/frontend/test_support/dom.js
+++ b/frontend/test_support/dom.js
@@ -1,13 +1,14 @@
 const jsdom = require('jsdom')
-const doc = jsdom.jsdom('<!doctype html><html><body></body></html>')
-const win = doc.defaultView
 
-global.document = doc
-global.window = win
+const { JSDOM } = jsdom
+const dom = new JSDOM('<!doctype html><html><body></body></html>')
+
+global.document = dom.window.document
+global.window = dom.window
 
 // take all properties of the window object and also attach it to the
 // mocha global object
-propagateToGlobal(win)
+propagateToGlobal(dom.window)
 
 // from mocha-jsdom https://github.com/rstacruz/mocha-jsdom/blob/master/index.js#L80
 function propagateToGlobal(window) {
diff --git a/package.json b/package.json
index 95fba618..bbbc6a4f 100644
--- a/package.json
+++ b/package.json
@@ -42,6 +42,7 @@
     "lodash": "4.17.4",
     "node-uuid": "1.4.8",
     "outdent": "0.3.0",
+    "prop-types": "15.5.10",
     "react": "15.6.1",
     "react-dom": "15.6.1",
     "react-draggable": "3.0.3",