       @updateTooltip()
 
     if typeof @item.onDidChangeTitle is 'function'
-      @titleSubscription = @item.onDidChangeTitle(titleChangedHandler)
+      @subscriptions.add @item.onDidChangeTitle(titleChangedHandler)
     else if typeof @item.on is 'function'
       #TODO Remove once old events are no longer supported
       @item.on('title-changed', titleChangedHandler)
-      @titleSubscription = dispose: =>
+      @subscriptions.add dispose: =>
         @item.off?('title-changed', titleChangedHandler)
 
     iconChangedHandler = =>
       @updateIcon()
 
     if typeof @item.onDidChangeIcon is 'function'
-      @iconSubscription = @item.onDidChangeIcon? =>
+      @subscriptions.add @item.onDidChangeIcon? =>
         @updateIcon()
     else if typeof @item.on is 'function'
       #TODO Remove once old events are no longer supported
       @item.on('icon-changed', iconChangedHandler)
-      @iconSubscription = dispose: =>
+      @subscriptions.add dispose: =>
         @item.off?('icon-changed', iconChangedHandler)
 
     modifiedHandler = =>
       @updateModifiedStatus()
 
     if typeof @item.onDidChangeModified is 'function'
-      @modifiedSubscription = @item.onDidChangeModified(modifiedHandler)
+      @subscriptions.add @item.onDidChangeModified(modifiedHandler)
     else if typeof @item.on is 'function'
       #TODO Remove once old events are no longer supported
       @item.on('modified-status-changed', modifiedHandler)
-      @modifiedSubscription = dispose: =>
+      @subscriptions.add dispose: =>
         @item.off?('modified-status-changed', modifiedHandler)
 
     if typeof @item.onDidSave is 'function'

    @tooltip?.dispose()

  destroy: ->
    @titleSubscription?.dispose()
    @modifiedSubscription?.dispose()
    @iconSubscription?.dispose()
    @mouseEnterSubscription?.dispose()
    @configSubscription?.dispose()
    @subscriptions?.dispose()
    @repoSubscriptions?.dispose()
    @destroyTooltip()
    @remove()

          @path = event.path
          @setupVcsStatus() if atom.config.get 'tabs.enableVcsColoring'

    @subscriptions.add atom.config.observe 'tabs.showIcons', =>
      @updateIconVisibility()

    @subscriptions.add atom.config.observe 'tabs.enableVcsColoring', (isEnabled) =>
