diff --git a/.travis.yml b/.travis.yml
index 949d2f3be..8cd3fdfc1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,11 +7,10 @@ cache:
   directories:
     - $HOME/.pip-cache/
     - $HOME/virtualenv/python3.5
-script:
-  # Travis will automatically detect requirements.txt and run pip install
-  - ./bootstrap
+install:
   - ./setup.py install
-  - py.test
+  - fireplace/bootstrap
+script: py.test
 notifications:
   email:
     on_failure: always
diff --git a/bootstrap b/fireplace/bootstrap
similarity index 56%
rename from bootstrap
rename to fireplace/bootstrap
index 3b835884e..7a566eec0 100755
--- a/bootstrap
+++ b/fireplace/bootstrap
@@ -1,8 +1,8 @@
-:; ./scripts/bootstrap.sh; exit $?
+:; $(dirname $0)/scripts/bootstrap.sh; exit $?
 @echo off
 @where Powershell.exe
 if %ERRORLEVEL% neq 0 (
 	echo Please install Powershell from https://www.microsoft.com/en-us/download/details.aspx?id=40855
 ) ELSE (
-	Powershell.exe -executionpolicy remotesigned -File scripts/bootstrap.ps1
+	Powershell.exe -executionpolicy remotesigned -File %~dp0scripts\bootstrap.ps1
 )
diff --git a/scripts/bootstrap.ps1 b/fireplace/scripts/bootstrap.ps1
similarity index 94%
rename from scripts/bootstrap.ps1
rename to fireplace/scripts/bootstrap.ps1
index de84f9ebf..3cf914c53 100644
--- a/scripts/bootstrap.ps1
+++ b/fireplace/scripts/bootstrap.ps1
@@ -3,7 +3,7 @@
 $BASEDIR=Split-Path $script:MyInvocation.MyCommand.Path
 $HSDATA_URL="https://github.com/HearthSim/hs-data.git"
 $HSDATA_DIR="$BASEDIR/hs-data"
-$CARDDEFS_OUT="$BASEDIR/../fireplace/CardDefs.xml"
+$CARDDEFS_OUT="$BASEDIR/../CardDefs.xml"
 
 # check python version
 $PY_MAJOR=$(python -c 'import sys; print(sys.version_info[0])')
diff --git a/scripts/bootstrap.py b/fireplace/scripts/bootstrap.py
similarity index 100%
rename from scripts/bootstrap.py
rename to fireplace/scripts/bootstrap.py
diff --git a/scripts/bootstrap.sh b/fireplace/scripts/bootstrap.sh
similarity index 94%
rename from scripts/bootstrap.sh
rename to fireplace/scripts/bootstrap.sh
index 129cad63f..1c84e5876 100755
--- a/scripts/bootstrap.sh
+++ b/fireplace/scripts/bootstrap.sh
@@ -3,7 +3,7 @@
 BASEDIR="$(dirname $0)"
 HSDATA_URL="https://github.com/HearthSim/hs-data.git"
 HSDATA_DIR="$BASEDIR/hs-data"
-CARDDEFS_OUT="$BASEDIR/../fireplace/CardDefs.xml"
+CARDDEFS_OUT="$BASEDIR/../CardDefs.xml"
 
 # check python version
 PY_MAJOR=$(python -c 'import sys; print(sys.version_info[0])')