diff --git a/inst/tinytest/test_phyloregion.R b/inst/tinytest/test_phyloregion.R
new file mode 100644
index 0000000..a9d4379
--- /dev/null
+++ b/inst/tinytest/test_phyloregion.R
@@ -0,0 +1,27 @@
+## generate data
+
+library(phyloregion)
+library(betapart)
+library(ape)
+
+tree <- read.tree(text ="((t1:1,t2:1)N2:1,(t3:1,t4:1)N3:1)N1;")
+com <- matrix(c(1,0,1,1,0,0,
+                1,0,0,1,1,0,
+                1,1,1,1,1,1,
+                0,0,1,1,0,1), 6, 4,
+              dimnames=list(paste0("g",1:6), tree$tip.label))
+
+pd_bioregion <- PD.sparse(com, tree)
+
+pbc_phyloregion <- phylobeta_core(com, tree)
+pbc_betapart <- phylo.betapart.core(com, tree)
+
+# check if betapart and phyloregion are equal
+expect_equal(phylo.beta.multi(pbc_phyloregion),
+             phylo.beta.multi(pbc_betapart))
+expect_equivalent(phylo.beta.pair(pbc_phyloregion),
+                  phylo.beta.pair(pbc_betapart))
+
+# test pd compare with picante
+# test
+pb_phyloregion <- phylobeta(com, tree)
diff --git a/tests/testthat.R b/tests/testthat.R
deleted file mode 100644
index 54df936..0000000
--- a/tests/testthat.R
+++ /dev/null
@@ -1,4 +0,0 @@
-library(testthat)
-suppressPackageStartupMessages(library(phyloregion))
-
-test_check("phyloregion")
diff --git a/tests/testthat/test_phylobeta.R b/tests/testthat/test_phylobeta.R
deleted file mode 100644
index ffe87d0..0000000
--- a/tests/testthat/test_phylobeta.R
+++ /dev/null
@@ -1,53 +0,0 @@
-context("phylobeta.core")
-
-## generate data
-
-library(phyloregion)
-library(betapart)
-library(ape)
-
-tree <- read.tree(text ="((t1:1,t2:1)N2:1,(t3:1,t4:1)N3:1)N1;")
-com <- matrix(c(1,0,1,1,0,0,
-                1,0,0,1,1,0,
-                1,1,1,1,1,1,
-                0,0,1,1,0,1), 6, 4,
-                dimnames=list(paste0("g",1:6), tree$tip.label))
-pd_bioregion <- PD.sparse(com, tree)
-pbc_phyloregion <- phylobeta.core(com, tree)
-
-data(africa)
-#fdir <- system.file("extdata", package = "phyloregion")
-comm <- africa$comm
-comm <- sampl2sparse(comm)
-tree <- africa$phylo
-
-pc <- match_phylo_comm(tree, comm)
-pb_tree <- phylobuilder(colnames(comm), tree)
-
-test_that("read.community works", {
-  ## common subtrees should be identical
-  expect_is(comm, "Matrix")
-  expect_is(pc$comm, "Matrix")
-})
-
-
-test_that("phylo_builder works", {
-  ## common subtrees should be identical
-  expect_is(pc$phy, "phylo")
-  expect_is(pb_tree, "phylo")
-  expect_gt(Ntip(pb_tree), Ntip(pc$phy))
-  expect_false(is.binary(pb_tree))
-})
-
-test_that("phylobeta.core works", {
-  ## common subtrees should be identical
-  expect_equal(phylo.beta.multi(pbc_phyloregion),
-               phylo.beta.multi(pbc_betapart))
-  expect_equivalent(phylo.beta.pair(pbc_phyloregion),
-                    phylo.beta.pair(pbc_betapart))
-
-})
-
-
-# test pd compare with picante
-# test
diff --git a/tests/tinytest.R b/tests/tinytest.R
new file mode 100644
index 0000000..8e88d9f
--- /dev/null
+++ b/tests/tinytest.R
@@ -0,0 +1,3 @@
+if (require("tinytest", quietly=TRUE)){
+    test_package("phyloregion")
+}